[Pkg-voip-commits] r3930 - in asterisk/trunk/debian: . patches

Mon Aug 6 01:45:35 UTC 2007

Author: paravoid
Date: 2007-08-06 01:45:34 +0000 (Mon, 06 Aug 2007)
New Revision: 3930

Added:
   asterisk/trunk/debian/patches/ast_key_dir.dpatch
Modified:
   asterisk/trunk/debian/asterisk.install
   asterisk/trunk/debian/changelog
   asterisk/trunk/debian/patches/00list
   asterisk/trunk/debian/patches/pubkey_jnctn.dpatch
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/trunk/debian/asterisk.install
===================================================================

--- asterisk/trunk/debian/asterisk.install	2007-08-05 20:58:26 UTC (rev 3929)
+++ asterisk/trunk/debian/asterisk.install	2007-08-06 01:45:34 UTC (rev 3930)
@@ -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/trunk/debian/changelog
===================================================================
--- asterisk/trunk/debian/changelog	2007-08-05 20:58:26 UTC (rev 3929)
+++ asterisk/trunk/debian/changelog	2007-08-06 01:45:34 UTC (rev 3930)
@@ -11,8 +11,12 @@
   [ 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.
 
- -- Mark Purcell <msp at debian.org>  Sun, 05 Aug 2007 20:35:54 +0100
+ -- Faidon Liambotis <paravoid at debian.org>  Mon, 06 Aug 2007 04:39:08 +0300
 
 asterisk (1:1.4.9~dfsg-1) unstable; urgency=high
 

Modified: asterisk/trunk/debian/patches/00list
===================================================================
--- asterisk/trunk/debian/patches/00list	2007-08-05 20:58:26 UTC (rev 3929)
+++ asterisk/trunk/debian/patches/00list	2007-08-06 01:45:34 UTC (rev 3930)
@@ -1,4 +1,5 @@
 astvarrundir
+ast_key_dir
 pubkey_jnctn
 dbug433884
 make-clean-fixes

Added: asterisk/trunk/debian/patches/ast_key_dir.dpatch
===================================================================
--- asterisk/trunk/debian/patches/ast_key_dir.dpatch	                        (rev 0)
+++ asterisk/trunk/debian/patches/ast_key_dir.dpatch	2007-08-06 01:45:34 UTC (rev 3930)
@@ -0,0 +1,22 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## ast_key_dir.dpatch by Faidon Liambotis <paravoid at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Put public/private keys in DATADIR/keys (aka /usr/share/asterisk/keys)
+## DP: instead of VARLIBDIR/keys. Besided being FHS compliant, that's where
+## DP: the Makefile installs them and what src/main/asterisk.c does when
+## DP: parsing asterisk.conf. Should be forwarded upstream.
+
+ at DPATCH@
+diff -urNad asterisk-1.4.9~dfsg~/build_tools/make_defaults_h asterisk-1.4.9~dfsg/build_tools/make_defaults_h
+--- asterisk-1.4.9~dfsg~/build_tools/make_defaults_h	2006-04-16 01:53:53.000000000 +0300
++++ asterisk-1.4.9~dfsg/build_tools/make_defaults_h	2007-08-06 04:24:38.000000000 +0300
+@@ -14,7 +14,7 @@
+ #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/trunk/debian/patches/pubkey_jnctn.dpatch
===================================================================
--- asterisk/trunk/debian/patches/pubkey_jnctn.dpatch	2007-08-05 20:58:26 UTC (rev 3929)
+++ asterisk/trunk/debian/patches/pubkey_jnctn.dpatch	2007-08-06 01:45:34 UTC (rev 3930)
@@ -7,9 +7,22 @@
 ## DP: See also http://www.junctionnetworks.com/Asterisk-config.htm
 
 @DPATCH@
-diff -urNad asterisk-1.1.9.0beta1.dfsg.1/keys/jnctn.pub /tmp/dpep.mnlLru/asterisk-1.1.9.0beta1.dfsg.1/keys/jnctn.pub
---- asterisk-1.1.9.0beta1.dfsg.1/keys/jnctn.pub	1970-01-01 02:00:00.000000000 +0200
-+++ /tmp/dpep.mnlLru/asterisk-1.1.9.0beta1.dfsg.1/keys/jnctn.pub	2005-10-12 23:35:32.236727110 +0200
+diff -urNad asterisk-1.4.9~dfsg~/Makefile asterisk-1.4.9~dfsg/Makefile
+--- asterisk-1.4.9~dfsg~/Makefile	2007-08-06 04:40:26.000000000 +0300
++++ asterisk-1.4.9~dfsg/Makefile	2007-08-06 04:41:07.000000000 +0300
+@@ -435,8 +435,7 @@
+ 	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/*.pub $(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
+diff -urNad asterisk-1.4.9~dfsg~/keys/jnctn.pub asterisk-1.4.9~dfsg/keys/jnctn.pub
+--- asterisk-1.4.9~dfsg~/keys/jnctn.pub	1970-01-01 02:00:00.000000000 +0200
++++ asterisk-1.4.9~dfsg/keys/jnctn.pub	2007-08-06 04:40:27.000000000 +0300
 @@ -0,0 +1,6 @@
 +-----BEGIN PUBLIC KEY-----
 +MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDWaDv4190BpeL5K+Yuq5Q7+vPs


