[Pkg-voip-commits] r2569 - in linphone/trunk/debian: . patches
Samuel Mimram
smimram at costa.debian.org
Mon Oct 16 18:07:12 UTC 2006
Author: smimram
Date: 2006-10-16 18:07:11 +0000 (Mon, 16 Oct 2006)
New Revision: 2569
Removed:
linphone/trunk/debian/patches/00mscodec_null_name.dpatch
linphone/trunk/debian/patches/10mscodec_null_strcmp.dpatch
linphone/trunk/debian/patches/gcc-4.1.dpatch
linphone/trunk/debian/patches/ice.dpatch
linphone/trunk/debian/patches/link_vorbis.dpatch
linphone/trunk/debian/patches/missing_headers.dpatch
linphone/trunk/debian/patches/no_developer_docs.dpatch
linphone/trunk/debian/patches/stun_sparc.dpatch
linphone/trunk/debian/patches/world_readable_passwords.dpatch
Modified:
linphone/trunk/debian/changelog
linphone/trunk/debian/patches/00list
Log:
New upstream release.
Modified: linphone/trunk/debian/changelog
===================================================================
--- linphone/trunk/debian/changelog 2006-10-16 16:33:26 UTC (rev 2568)
+++ linphone/trunk/debian/changelog 2006-10-16 18:07:11 UTC (rev 2569)
@@ -1,3 +1,10 @@
+linphone (1.5.0-1) unstable; urgency=low
+
+ * New upstream release.
+ * Removed ice.dpatch and stun_sparc.dpatch, integrated upstream.
+
+ -- Samuel Mimram <smimram at debian.org> Wed, 11 Oct 2006 11:33:53 +0000
+
linphone (1.4.1-2) unstable; urgency=low
* Added ice.dpatch to fix the FTBFS on amd64 (thanks Jérémy Bobio)
Modified: linphone/trunk/debian/patches/00list
===================================================================
--- linphone/trunk/debian/patches/00list 2006-10-16 16:33:26 UTC (rev 2568)
+++ linphone/trunk/debian/patches/00list 2006-10-16 18:07:11 UTC (rev 2569)
@@ -1,4 +1,2 @@
desktop_icon
gnome_applet_dir
-ice
-stun_sparc
Deleted: linphone/trunk/debian/patches/00mscodec_null_name.dpatch
===================================================================
--- linphone/trunk/debian/patches/00mscodec_null_name.dpatch 2006-10-16 16:33:26 UTC (rev 2568)
+++ linphone/trunk/debian/patches/00mscodec_null_name.dpatch 2006-10-16 18:07:11 UTC (rev 2569)
@@ -1,46 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## mscodec_null_name.dpatch by Samuel Mimram <samuel.mimram at ens-lyon.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Check if the name arguments are NULL (if it's the case, we should return NULL).
-
- at DPATCH@
-diff -urNad linphone-1.0.0pre4/mediastreamer/mscodec.c /tmp/dpep.w47mIR/linphone-1.0.0pre4/mediastreamer/mscodec.c
---- linphone-1.0.0pre4/mediastreamer/mscodec.c 2003-06-08 08:17:54.000000000 +0200
-+++ /tmp/dpep.w47mIR/linphone-1.0.0pre4/mediastreamer/mscodec.c 2004-10-31 16:51:30.000000000 +0100
-@@ -69,7 +69,7 @@
- {
- GList *elem=filter_list;
- MSFilterInfo *info;
-- while (elem!=NULL)
-+ while (elem!=NULL && name!=NULL)
- {
- info=(MSFilterInfo *)elem->data;
- if ( (info->type==MS_FILTER_AUDIO_CODEC) ){
-@@ -87,7 +87,7 @@
- {
- GList *elem=filter_list;
- MSFilterInfo *info;
-- while (elem!=NULL)
-+ while (elem!=NULL && name!=NULL)
- {
- info=(MSFilterInfo *)elem->data;
- if ( (info->type==MS_FILTER_VIDEO_CODEC) ){
-@@ -122,7 +122,7 @@
- {
- GList *elem=filter_list;
- MSFilterInfo *info;
-- while (elem!=NULL)
-+ while (elem!=NULL && name!=NULL)
- {
- info=(MSFilterInfo *)elem->data;
- if ((info->type==MS_FILTER_AUDIO_CODEC) || (info->type==MS_FILTER_VIDEO_CODEC)){
-@@ -140,7 +140,7 @@
- {
- GList *elem=filter_list;
- MSFilterInfo *info;
-- while (elem!=NULL)
-+ while (elem!=NULL && name!=NULL)
- {
- info=(MSFilterInfo *)elem->data;
- if ((info->type==MS_FILTER_AUDIO_CODEC) || (info->type==MS_FILTER_VIDEO_CODEC)){
Deleted: linphone/trunk/debian/patches/10mscodec_null_strcmp.dpatch
===================================================================
--- linphone/trunk/debian/patches/10mscodec_null_strcmp.dpatch 2006-10-16 16:33:26 UTC (rev 2568)
+++ linphone/trunk/debian/patches/10mscodec_null_strcmp.dpatch 2006-10-16 18:07:11 UTC (rev 2569)
@@ -1,52 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 10mscodec_null_strcmp.dpatch by Samuel Mimram <smimram at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Check that we are not using NULL pointers.
-
- at DPATCH@
-diff -urNad linphone-1.0.1/mediastreamer/mscodec.c /tmp/dpep.crLUDd/linphone-1.0.1/mediastreamer/mscodec.c
---- linphone-1.0.1/mediastreamer/mscodec.c 2005-03-30 11:14:09.000000000 +0200
-+++ /tmp/dpep.crLUDd/linphone-1.0.1/mediastreamer/mscodec.c 2005-03-30 11:18:23.000000000 +0200
-@@ -82,9 +82,9 @@
- while (elem!=NULL && name!=NULL)
- {
- info=(MSFilterInfo *)elem->data;
-- if ( (info->type==MS_FILTER_AUDIO_CODEC) ){
-+ if (info && (info->type==MS_FILTER_AUDIO_CODEC) ){
- MSCodecInfo *codinfo=(MSCodecInfo *)info;
-- if (strcmp(codinfo->description,name)==0){
-+ if (codinfo->description && strcmp(codinfo->description,name)==0){
- return MS_CODEC_INFO(info);
- }
- }
-@@ -100,9 +100,9 @@
- while (elem!=NULL && name!=NULL)
- {
- info=(MSFilterInfo *)elem->data;
-- if ( (info->type==MS_FILTER_VIDEO_CODEC) ){
-+ if (info && (info->type==MS_FILTER_VIDEO_CODEC) ){
- MSCodecInfo *codinfo=(MSCodecInfo *)info;
-- if (strcmp(codinfo->description,name)==0){
-+ if (codinfo->description && strcmp(codinfo->description,name)==0){
- return MS_CODEC_INFO(info);
- }
- }
-@@ -137,7 +137,7 @@
- info=(MSFilterInfo *)elem->data;
- if ((info->type==MS_FILTER_AUDIO_CODEC) || (info->type==MS_FILTER_VIDEO_CODEC)){
- MSCodecInfo *codinfo=(MSCodecInfo *)elem->data;
-- if (strcmp(info->name,name)==0){
-+ if (info->name && strcmp(info->name,name)==0){
- return codinfo->encoder();
- }
- }
-@@ -155,7 +155,7 @@
- info=(MSFilterInfo *)elem->data;
- if ((info->type==MS_FILTER_AUDIO_CODEC) || (info->type==MS_FILTER_VIDEO_CODEC)){
- MSCodecInfo *codinfo=(MSCodecInfo *)elem->data;
-- if (strcmp(info->name,name)==0){
-+ if (info->name && strcmp(info->name,name)==0){
- return codinfo->decoder();
- }
- }
Deleted: linphone/trunk/debian/patches/gcc-4.1.dpatch
===================================================================
--- linphone/trunk/debian/patches/gcc-4.1.dpatch 2006-10-16 16:33:26 UTC (rev 2568)
+++ linphone/trunk/debian/patches/gcc-4.1.dpatch 2006-10-16 18:07:11 UTC (rev 2569)
@@ -1,26 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## gcc-4.1.dpatch by Samuel Mimram <smimram at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Make linphone compile with gcc 4.1.
-
- at DPATCH@
-diff -urNad linphone-1.3.2~/oRTP/src/sessionset.c linphone-1.3.2/oRTP/src/sessionset.c
---- linphone-1.3.2~/oRTP/src/sessionset.c 2006-02-01 16:30:04.000000000 +0000
-+++ linphone-1.3.2/oRTP/src/sessionset.c 2006-03-22 13:58:00.000000000 +0000
-@@ -63,9 +63,12 @@
- uint32_t *mask1,*mask2,*mask3;
- int i=0;
- int j,ret=0;
-- mask1=(uint32_t*)&sched_set->rtpset;
-- mask2=(uint32_t*)&user_set->rtpset;
-- mask3=(uint32_t*)&result_set->rtpset;
-+ ortp_fd_set *ss=&sched_set->rtpset;
-+ ortp_fd_set *us=&user_set->rtpset;
-+ ortp_fd_set *rs=&result_set->rtpset;
-+ mask1=(uint32_t*)ss;
-+ mask2=(uint32_t*)us;
-+ mask3=(uint32_t*)rs;
- while(i<maxs+1){
- *mask3=(*mask1) & (*mask2); /* computes the AND between the two masks*/
- /* and unset the sessions that have been found from the sched_set */
Deleted: linphone/trunk/debian/patches/ice.dpatch
===================================================================
--- linphone/trunk/debian/patches/ice.dpatch 2006-10-16 16:33:26 UTC (rev 2568)
+++ linphone/trunk/debian/patches/ice.dpatch 2006-10-16 18:07:11 UTC (rev 2569)
@@ -1,19 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## ice.dpatch by Jérémy Bobbio <jeremy.bobbio at etu.upmc.fr>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Correct type for addr_len. See #390009.
-
- at DPATCH@
-diff -urNad linphone-1.4.1~/mediastreamer2/src/ice.c linphone-1.4.1/mediastreamer2/src/ice.c
---- linphone-1.4.1~/mediastreamer2/src/ice.c 2006-08-22 14:34:26.000000000 +0000
-+++ linphone-1.4.1/mediastreamer2/src/ice.c 2006-09-30 10:35:29.000000000 +0000
-@@ -173,7 +173,7 @@
- int err, tmp;
- int sock;
- struct sockaddr_storage addr;
-- size_t addr_len;
-+ socklen_t addr_len;
-
- strcpy (loc, "127.0.0.1"); /* always fallback to local loopback */
-
Deleted: linphone/trunk/debian/patches/link_vorbis.dpatch
===================================================================
--- linphone/trunk/debian/patches/link_vorbis.dpatch 2006-10-16 16:33:26 UTC (rev 2568)
+++ linphone/trunk/debian/patches/link_vorbis.dpatch 2006-10-16 18:07:11 UTC (rev 2569)
@@ -1,19 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## link_vorbis.dpatch by Samuel Mimram <smimram at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Workaround forgotten linking with vorbisenc.
-
- at DPATCH@
-diff -urNad linphone-1.3.0~/mediastreamer/Makefile.in linphone-1.3.0/mediastreamer/Makefile.in
---- linphone-1.3.0~/mediastreamer/Makefile.in 2006-03-08 10:04:40.000000000 +0100
-+++ linphone-1.3.0/mediastreamer/Makefile.in 2006-03-15 23:48:54.000000000 +0100
-@@ -384,7 +384,7 @@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
- VIDEO_CFLAGS = @VIDEO_CFLAGS@
--VIDEO_LIBS = @VIDEO_LIBS@
-+VIDEO_LIBS = @VIDEO_LIBS@ -lvorbisenc
- XGETTEXT = @XGETTEXT@
- ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
Deleted: linphone/trunk/debian/patches/missing_headers.dpatch
===================================================================
--- linphone/trunk/debian/patches/missing_headers.dpatch 2006-10-16 16:33:26 UTC (rev 2568)
+++ linphone/trunk/debian/patches/missing_headers.dpatch 2006-10-16 18:07:11 UTC (rev 2569)
@@ -1,68 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## missing_headers.dpatch by Samuel Mimram <smimram at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Include missing header files.
-
- at DPATCH@
-diff -urNad linphone-1.3.5~/console/commands.c linphone-1.3.5/console/commands.c
---- linphone-1.3.5~/console/commands.c 2006-03-04 11:17:10.000000000 +0000
-+++ linphone-1.3.5/console/commands.c 2006-05-15 11:04:47.000000000 +0000
-@@ -30,6 +30,7 @@
- #include <limits.h>
- #include <ctype.h>
- #include <unistd.h>
-+#include <readline/readline.h>
- #include <linphonecore.h>
- #include "linphonec.h"
-
-diff -urNad linphone-1.3.5~/console/linphonec.c linphone-1.3.5/console/linphonec.c
---- linphone-1.3.5~/console/linphonec.c 2006-03-16 17:17:40.000000000 +0000
-+++ linphone-1.3.5/console/linphonec.c 2006-05-15 11:04:30.000000000 +0000
-@@ -31,6 +31,8 @@
- #include <string.h>
- #include <signal.h>
- #include <limits.h>
-+#include <readline/readline.h>
-+#include <readline/history.h>
- #include <linphonecore.h>
- #include "linphonec.h"
- #include "../config.h"
-diff -urNad linphone-1.3.5~/exosip/eXutils.c linphone-1.3.5/exosip/eXutils.c
---- linphone-1.3.5~/exosip/eXutils.c 2005-09-09 10:47:05.000000000 +0000
-+++ linphone-1.3.5/exosip/eXutils.c 2006-05-15 11:04:11.000000000 +0000
-@@ -218,6 +218,7 @@
- #include <sys/param.h>
-
- #include <stdio.h>
-+#include <errno.h>
-
- static int ppl_dns_default_gateway_ipv4 (char *address, int size);
- static int ppl_dns_default_gateway_ipv6 (char *address, int size);
-diff -urNad linphone-1.3.5~/exosip/jcallback.c linphone-1.3.5/exosip/jcallback.c
---- linphone-1.3.5~/exosip/jcallback.c 2006-03-08 11:48:57.000000000 +0000
-+++ linphone-1.3.5/exosip/jcallback.c 2006-05-15 11:04:11.000000000 +0000
-@@ -41,6 +41,8 @@
- #include <sys/types.h>
- #include <sys/socket.h>
- #include <netdb.h>
-+
-+#include <errno.h>
- #endif
-
- #include <eXosip.h>
-diff -urNad linphone-1.3.5~/exosip/udp.c linphone-1.3.5/exosip/udp.c
---- linphone-1.3.5~/exosip/udp.c 2006-02-18 14:40:19.000000000 +0000
-+++ linphone-1.3.5/exosip/udp.c 2006-05-15 11:04:11.000000000 +0000
-@@ -36,9 +36,10 @@
- #endif
- #else
- #include <windows.h>
--#include <errno.h>
- #endif
-
-+#include <errno.h>
-+
- extern eXosip_t eXosip;
-
- /* Private functions */
Deleted: linphone/trunk/debian/patches/no_developer_docs.dpatch
===================================================================
--- linphone/trunk/debian/patches/no_developer_docs.dpatch 2006-10-16 16:33:26 UTC (rev 2568)
+++ linphone/trunk/debian/patches/no_developer_docs.dpatch 2006-10-16 18:07:11 UTC (rev 2569)
@@ -1,19 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## no_developer_docs.dpatch by Samuel Mimram <smimram at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Do not build developer's documentation.
-
- at DPATCH@
-diff -urNad linphone-1.3.5~/Makefile.am linphone-1.3.5/Makefile.am
---- linphone-1.3.5~/Makefile.am 2006-04-04 08:18:47.000000000 +0000
-+++ linphone-1.3.5/Makefile.am 2006-05-15 09:34:52.000000000 +0000
-@@ -7,7 +7,7 @@
-
- SUBDIRS = m4 support pixmaps po ipkg oRTP gsmlib lpc10-1.5 \
- $(WIN32ACM_DIR) mediastreamer mediastreamer2\
-- media_api exosip coreapi console gnome share developer-docs
-+ media_api exosip coreapi console gnome share
-
-
- EXTRA_DIST = linphone2.glade BUGS linphone.kdevprj \
Deleted: linphone/trunk/debian/patches/stun_sparc.dpatch
===================================================================
--- linphone/trunk/debian/patches/stun_sparc.dpatch 2006-10-16 16:33:26 UTC (rev 2568)
+++ linphone/trunk/debian/patches/stun_sparc.dpatch 2006-10-16 18:07:11 UTC (rev 2569)
@@ -1,19 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## stun_sparc.dpatch by Samuel Mimram <smimram at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Don't use code for SUN on linux sparcs. See #390009.
-
- at DPATCH@
-diff -urNad linphone-1.4.1~/oRTP/src/stun.c linphone-1.4.1/oRTP/src/stun.c
---- linphone-1.4.1~/oRTP/src/stun.c 2006-09-12 19:21:29.000000000 +0000
-+++ linphone-1.4.1/oRTP/src/stun.c 2006-09-30 17:13:06.000000000 +0000
-@@ -758,7 +758,7 @@
- asm("rdtsc" : "=A" (tick));
- #elif defined(__GNUC__) && defined(__amd64__)
- asm("rdtsc" : "=A" (tick));
--#elif defined (__SUNPRO_CC) || defined( __sparc__ )
-+#elif defined (__SUNPRO_CC) && defined( __sparc__ )
- tick = gethrtime();
- #elif defined(__MACH__)
- {
Deleted: linphone/trunk/debian/patches/world_readable_passwords.dpatch
===================================================================
--- linphone/trunk/debian/patches/world_readable_passwords.dpatch 2006-10-16 16:33:26 UTC (rev 2568)
+++ linphone/trunk/debian/patches/world_readable_passwords.dpatch 2006-10-16 18:07:11 UTC (rev 2569)
@@ -1,42 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 361913_world_readable_passwords.dpatch by Alec Berryman <alec at thened.net>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Don't create group- or world-accessible configuration files.
-## DP: Also insure such configuration files don't continue to exist.
-
- at DPATCH@
-diff -urNad linphone-1.3.3~/coreapi/lpconfig.c linphone-1.3.3/coreapi/lpconfig.c
---- linphone-1.3.3~/coreapi/lpconfig.c 2006-03-24 09:37:42.000000000 +0000
-+++ linphone-1.3.3/coreapi/lpconfig.c 2006-05-14 17:14:09.000000000 +0100
-@@ -36,6 +36,9 @@
- #include <stdlib.h>
- #include <string.h>
- #include <assert.h>
-+#include <errno.h>
-+#include <sys/types.h>
-+#include <sys/stat.h>
-
- #define lp_new0(type,n) (type*)calloc(sizeof(type),n)
-
-@@ -216,6 +219,11 @@
- if (lpconfig->file!=NULL){
- lp_config_parse(lpconfig);
- fclose(lpconfig->file);
-+ /* make existing configuration files non-group/world-accessible */
-+ if (chmod(filename, S_IRUSR | S_IWUSR) == -1)
-+ g_warning("unable to correct permissions on "
-+ "configuration file: %s",
-+ strerror(errno));
- lpconfig->file=NULL;
- }
- }
-@@ -324,6 +332,8 @@
- int lp_config_sync(LpConfig *lpconfig){
- FILE *file;
- if (lpconfig->filename==NULL) return -1;
-+ /* don't create group/world-accessible files */
-+ (void) umask(S_IRWXG | S_IRWXO);
- file=fopen(lpconfig->filename,"w");
- if (file==NULL){
- g_warning("Could not write %s !",lpconfig->filename);
More information about the Pkg-voip-commits
mailing list