[Pkg-voip-commits] r3931 - in asterisk/branches/experimental/debian: . patches

[paravoid at alioth.debian.org]

Author: paravoid
Date: 2007-08-06 01:54:40 +0000 (Mon, 06 Aug 2007)
New Revision: 3931

Added:
   asterisk/branches/experimental/debian/patches/ast_key_dir
Modified:
   asterisk/branches/experimental/debian/asterisk.install
   asterisk/branches/experimental/debian/changelog
   asterisk/branches/experimental/debian/patches/pubkey_jnctn
   asterisk/branches/experimental/debian/patches/series
Log:
* Add ast_key_dir patch to move keys from /var/lib/asterisk/keys to
  /usr/share/asterisk/keys where they should be.
* Actually ship keys, including Junction Networks' by fixing pubkey_jnctn
  patch.

Modified: asterisk/branches/experimental/debian/asterisk.install
===================================================================
--- asterisk/branches/experimental/debian/asterisk.install	2007-08-06 01:45:34 UTC (rev 3930)
+++ asterisk/branches/experimental/debian/asterisk.install	2007-08-06 01:54:40 UTC (rev 3931)
@@ -1,4 +1,5 @@
 usr/lib/asterisk
 usr/sbin
-usr/share/asterisk/firmware/iax
+usr/share/asterisk/firmware
+usr/share/asterisk/keys
 ../asterisk_fix usr/share/asterisk/bin

Modified: asterisk/branches/experimental/debian/changelog
===================================================================
--- asterisk/branches/experimental/debian/changelog	2007-08-06 01:45:34 UTC (rev 3930)
+++ asterisk/branches/experimental/debian/changelog	2007-08-06 01:54:40 UTC (rev 3931)
@@ -10,6 +10,10 @@
   [ Faidon Liambotis ]
   * Refer to /usr/share/common-licenses/GPL-2 instead of GPL. The code is
     -for now- GPLv2-only and in light of GPLv3, pointing to GPL is misleading.
+  * Add ast_key_dir patch to move keys from /var/lib/asterisk/keys to
+    /usr/share/asterisk/keys where they should be.
+  * Actually ship keys, including Junction Networks' by fixing pubkey_jnctn
+    patch.
   * Switch to quilt as a patch management system instead of dpatch.
   * Split bristuff 0.4.0-test3 into individual patches and add it to the quilt
     patchset.
@@ -20,7 +24,7 @@
   [ Kilian Krause ]
   * backports/etch: replace libsnmp10-dev with libsnmp9-dev
 
- -- Kilian Krause <kilian at debian.org>  Sun,  5 Aug 2007 15:58:45 +0200
+ -- Faidon Liambotis <paravoid at debian.org>  Mon, 06 Aug 2007 04:47:44 +0300
 
 asterisk (1:1.4.9~dfsg-1) unstable; urgency=high
 

Added: asterisk/branches/experimental/debian/patches/ast_key_dir
===================================================================
--- asterisk/branches/experimental/debian/patches/ast_key_dir	                        (rev 0)
+++ asterisk/branches/experimental/debian/patches/ast_key_dir	2007-08-06 01:54:40 UTC (rev 3931)
@@ -0,0 +1,19 @@
+Put public/private keys in DATADIR/keys (aka /usr/share/asterisk/keys) instead
+of VARLIBDIR/keys. Besided being FHS compliant, that's where the Makefile
+installs them and what src/main/asterisk.c does when parsing asterisk.conf.
+
+Should be forwarded upstream.
+
+ -- Faidon Liambotis <paravoid at debian.org>
+
+--- asterisk-1.4.9~dfsg.orig/build_tools/make_defaults_h
++++ asterisk-1.4.9~dfsg/build_tools/make_defaults_h
+@@ -14,7 +14,7 @@ cat << END
+ #define AST_DATA_DIR   "${INSTALL_PATH}${ASTDATADIR}"
+ #define AST_LOG_DIR    "${INSTALL_PATH}${ASTLOGDIR}"
+ #define AST_AGI_DIR    "${INSTALL_PATH}${AGI_DIR}"
+-#define AST_KEY_DIR    "${INSTALL_PATH}${ASTVARLIBDIR}/keys"
++#define AST_KEY_DIR    "${INSTALL_PATH}${ASTDATADIR}/keys"
+ #define AST_DB         "${INSTALL_PATH}${ASTVARLIBDIR}/astdb"
+ #define AST_TMP_DIR    "${INSTALL_PATH}${ASTSPOOLDIR}/tmp"
+ 

Modified: asterisk/branches/experimental/debian/patches/pubkey_jnctn
===================================================================
--- asterisk/branches/experimental/debian/patches/pubkey_jnctn	2007-08-06 01:45:34 UTC (rev 3930)
+++ asterisk/branches/experimental/debian/patches/pubkey_jnctn	2007-08-06 01:54:40 UTC (rev 3931)
@@ -5,6 +5,13 @@
 
  -- Tzafrir Cohen <tzafrir.cohen at xorcom.com>
 
+Also fix the Makefile to copy all keys on make install instead of mentioning
+them explicitely.
+
+Should forward upstream.
+
+ -- Faidon Liambotis <paravoid at debian.org>
+
 --- /dev/null
 +++ asterisk-1.4.9~dfsg/keys/jnctn.pub
 @@ -0,0 +1,6 @@
@@ -14,3 +21,15 @@
 +3Ilu//eX8ph8Wu+Oxs/ymi/hzKm+Cd6aty94zYuqiegc0KdrjvU5TLQAkIQpiB6k
 +CvuIm0R0XXQjj3R7LwIDAQAB
 +-----END PUBLIC KEY-----
+--- asterisk-1.4.9~dfsg.orig/Makefile
++++ asterisk-1.4.9~dfsg/Makefile
+@@ -435,8 +435,7 @@ bininstall: _all
+ 	mkdir -p $(DESTDIR)$(ASTDATADIR)/firmware
+ 	mkdir -p $(DESTDIR)$(ASTDATADIR)/firmware/iax
+ 	mkdir -p $(DESTDIR)$(ASTMANDIR)/man8
+-	$(INSTALL) -m 644 keys/iaxtel.pub $(DESTDIR)$(ASTDATADIR)/keys
+-	$(INSTALL) -m 644 keys/freeworlddialup.pub $(DESTDIR)$(ASTDATADIR)/keys
++	$(INSTALL) -m 644 keys/* $(DESTDIR)$(ASTDATADIR)/keys
+ 	$(INSTALL) -m 644 doc/asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8
+ 	$(INSTALL) -m 644 contrib/scripts/astgenkey.8 $(DESTDIR)$(ASTMANDIR)/man8
+ 	$(INSTALL) -m 644 contrib/scripts/autosupport.8 $(DESTDIR)$(ASTMANDIR)/man8

Modified: asterisk/branches/experimental/debian/patches/series
===================================================================
--- asterisk/branches/experimental/debian/patches/series	2007-08-06 01:45:34 UTC (rev 3930)
+++ asterisk/branches/experimental/debian/patches/series	2007-08-06 01:54:40 UTC (rev 3931)
@@ -1,5 +1,6 @@
 #
 astvarrundir
+ast_key_dir
 pubkey_jnctn
 dbug433884
 make-clean-fixes