[Pkg-voip-commits] r1765 - in linphone/trunk/debian: . patches
Samuel Mimram
smimram at costa.debian.org
Mon May 15 17:35:25 UTC 2006
Author: smimram
Date: 2006-05-15 17:35:24 +0000 (Mon, 15 May 2006)
New Revision: 1765
Added:
linphone/trunk/debian/patches/missing_headers.dpatch
linphone/trunk/debian/patches/no_developer_docs.dpatch
linphone/trunk/debian/patches/world_readable_passwords.dpatch
Removed:
linphone/trunk/debian/patches/private_config.dpatch
Modified:
linphone/trunk/debian/changelog
linphone/trunk/debian/control
linphone/trunk/debian/patches/00list
linphone/trunk/debian/rules
Log:
Fixing various important bugs.
Modified: linphone/trunk/debian/changelog
===================================================================
--- linphone/trunk/debian/changelog 2006-05-13 19:01:39 UTC (rev 1764)
+++ linphone/trunk/debian/changelog 2006-05-15 17:35:24 UTC (rev 1765)
@@ -1,16 +1,21 @@
-linphone (1.3.5-1) UNRELEASED; urgency=low
+linphone (1.3.5-1) unstable; urgency=low
[ Kilian Krause ]
* Bump speex build-dep to 1.1.12 as configure requests.
[ Samuel Mimram ]
* New upstream release.
- * Added private_config.dpatch to move configuration file from ~/.gnome2 to
- ~/.gnome2_private since it can contain passwords, closes: #361913.
+ * Added no_developer_doc.dpatch in order not to build some parts of the
+ documentation which don't build for now (we didn't ship them anyway),
+ closes: #365523. We need to regenerate configure and Makefiles for this.
+ * Added world_readable_passwords.dpatch to change the permissions of the
+ configuration file to 600 (thanks Alec Berryman). This might be too strict
+ but at least it is safe, closes: #361913.
* Updated desktop_icon.dpatch to correct the location of the icon in the
linphone.desktop file, closes: #346435.
+ * Updated standards version to 3.7.2, no changes needed.
- -- Samuel Mimram <smimram at debian.org> Thu, 13 Apr 2006 11:45:54 +0000
+ -- Samuel Mimram <smimram at debian.org> Mon, 15 May 2006 09:02:05 +0000
linphone (1.3.3-1) unstable; urgency=low
Modified: linphone/trunk/debian/control
===================================================================
--- linphone/trunk/debian/control 2006-05-13 19:01:39 UTC (rev 1764)
+++ linphone/trunk/debian/control 2006-05-15 17:35:24 UTC (rev 1765)
@@ -3,8 +3,8 @@
Priority: optional
Maintainer: Debian VoIP Team <pkg-voip-maintainers at lists.alioth.debian.org>
Uploaders: Samuel Mimram <smimram at debian.org>
-Build-Depends: debhelper (>= 4.0.0), autotools-dev, pkg-config, libglib2.0-dev, libosip2-dev (>= 2.2.0), libasound2-dev, libjack0.100.0-dev, libspeex-dev (>= 1.1.12), libsamplerate0-dev, libxml-parser-perl, gtk-doc-tools, docbook-utils, libgnomeui-dev, libgnome2-dev, gnome-applets, libpanel-applet2-dev, dpatch, libavcodec-dev, libvorbis-dev, libreadline5-dev, libsdl1.2-dev
-Standards-Version: 3.6.2
+Build-Depends: debhelper (>= 4.0.0), autoconf, automake1.9, autotools-dev, libtool, pkg-config, libglib2.0-dev, libosip2-dev (>= 2.2.0), libasound2-dev, libjack0.100.0-dev, libspeex-dev (>= 1.1.12), libsamplerate0-dev, libxml-parser-perl, gtk-doc-tools, docbook-utils, libgnomeui-dev, libgnome2-dev, gnome-applets, libpanel-applet2-dev, dpatch, libavcodec-dev, libvorbis-dev, libreadline5-dev, libsdl1.2-dev
+Standards-Version: 3.7.2
Package: linphone
Architecture: any
Modified: linphone/trunk/debian/patches/00list
===================================================================
--- linphone/trunk/debian/patches/00list 2006-05-13 19:01:39 UTC (rev 1764)
+++ linphone/trunk/debian/patches/00list 2006-05-15 17:35:24 UTC (rev 1765)
@@ -1,3 +1,4 @@
+no_developer_docs
desktop_icon
gnome_applet_dir
00mscodec_null_name
@@ -2,4 +3,3 @@
10mscodec_null_strcmp
-link_vorbis
gcc-4.1
-private_config
+world_readable_passwords
Added: linphone/trunk/debian/patches/missing_headers.dpatch
===================================================================
--- linphone/trunk/debian/patches/missing_headers.dpatch 2006-05-13 19:01:39 UTC (rev 1764)
+++ linphone/trunk/debian/patches/missing_headers.dpatch 2006-05-15 17:35:24 UTC (rev 1765)
@@ -0,0 +1,68 @@
+#! /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 */
Property changes on: linphone/trunk/debian/patches/missing_headers.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Added: linphone/trunk/debian/patches/no_developer_docs.dpatch
===================================================================
--- linphone/trunk/debian/patches/no_developer_docs.dpatch 2006-05-13 19:01:39 UTC (rev 1764)
+++ linphone/trunk/debian/patches/no_developer_docs.dpatch 2006-05-15 17:35:24 UTC (rev 1765)
@@ -0,0 +1,19 @@
+#! /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 \
Property changes on: linphone/trunk/debian/patches/no_developer_docs.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Deleted: linphone/trunk/debian/patches/private_config.dpatch
===================================================================
--- linphone/trunk/debian/patches/private_config.dpatch 2006-05-13 19:01:39 UTC (rev 1764)
+++ linphone/trunk/debian/patches/private_config.dpatch 2006-05-15 17:35:24 UTC (rev 1765)
@@ -1,45 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## private_config.dpatch by Samuel Mimram <smimram at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Move configuration file from ~/.gnome2/linphone to
-## DP: ~/.gnome2_private/linphone since it can contain passwords and other
-## DP: private informations.
-
- at DPATCH@
-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-04-13 11:42:03.000000000 +0000
-@@ -794,7 +794,7 @@
- }
-
- free(old_cfg_cli);
-- old_cfg_gui = g_strdup_printf("%s/.gnome2/linphone", home);
-+ old_cfg_gui = g_strdup_printf("%s/.gnome2_private/linphone", home);
-
- /*
- * If the *OLD* GUI configurations exist copy it to
-diff -urNad linphone-1.3.5~/gnome/linphone.c linphone-1.3.5/gnome/linphone.c
---- linphone-1.3.5~/gnome/linphone.c 2005-12-07 16:43:53.000000000 +0000
-+++ linphone-1.3.5/gnome/linphone.c 2006-04-13 11:42:26.000000000 +0000
-@@ -342,7 +342,7 @@
- void linphone_gnome_init(LinphoneGnomeUI *ui,LinphoneCore *lc)
- {
- gchar *configfile_name =
-- g_strdup_printf ("%s/.gnome2/linphone", getenv ("HOME"));
-+ g_strdup_printf ("%s/.gnome2_private/linphone", getenv ("HOME"));
- linphone_gnome_ui_init(ui,lc);
- linphone_gnome_ui_show(ui);
- linphone_core_init(lc,&linphone_gnome_vtable,configfile_name,(gpointer)ui);
-diff -urNad linphone-1.3.5~/share/C/linphone.1 linphone-1.3.5/share/C/linphone.1
---- linphone-1.3.5~/share/C/linphone.1 2005-03-04 16:57:31.000000000 +0000
-+++ linphone-1.3.5/share/C/linphone.1 2006-04-13 11:40:38.000000000 +0000
-@@ -24,7 +24,7 @@
- Output internal messages on stdout, this is useful for debugging.
- .SH "FILES"
- .LP
--\fI~/.gnome2/linphone\fP
-+\fI~/.gnome2_private/linphone\fP
- .br
- This is where linphone reads its config information. You do not have to modify or edit this file.
- .br
Added: linphone/trunk/debian/patches/world_readable_passwords.dpatch
===================================================================
--- linphone/trunk/debian/patches/world_readable_passwords.dpatch 2006-05-13 19:01:39 UTC (rev 1764)
+++ linphone/trunk/debian/patches/world_readable_passwords.dpatch 2006-05-15 17:35:24 UTC (rev 1765)
@@ -0,0 +1,42 @@
+#! /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);
Property changes on: linphone/trunk/debian/patches/world_readable_passwords.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Modified: linphone/trunk/debian/rules
===================================================================
--- linphone/trunk/debian/rules 2006-05-13 19:01:39 UTC (rev 1764)
+++ linphone/trunk/debian/rules 2006-05-15 17:35:24 UTC (rev 1765)
@@ -45,6 +45,7 @@
configure-stamp: configure
dh_testdir
+ ./autogen.sh
CFLAGS="$(CFLAGS)" ./configure $(confflags) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --disable-static --sysconfdir=/etc --with-osip=/usr --with-speex=/usr --enable-ipv6
#--enable-video
touch configure-stamp
More information about the Pkg-voip-commits
mailing list