[Pkg-voip-commits] r933 - in libpri/trunk/debian: . patches
Mark Purcell
msp at costa.debian.org
Tue Nov 1 21:47:21 UTC 2005
Author: msp
Date: 2005-11-01 21:47:20 +0000 (Tue, 01 Nov 2005)
New Revision: 933
Removed:
libpri/trunk/debian/patches/q931.dpatch
Modified:
libpri/trunk/debian/changelog
libpri/trunk/debian/patches/00list
libpri/trunk/debian/patches/Makefile.dpatch
Log:
* New upstream release
* Update Makefile.patch
Modified: libpri/trunk/debian/changelog
===================================================================
--- libpri/trunk/debian/changelog 2005-11-01 21:34:39 UTC (rev 932)
+++ libpri/trunk/debian/changelog 2005-11-01 21:47:20 UTC (rev 933)
@@ -1,8 +1,9 @@
-libpri (1.2.0-beta2-1) UNRELEASED; urgency=low
+libpri (1.2.0-beta2-1) experimental; urgency=low
- * (NOT RELEASED YET) New upstream release
+ * New upstream release
+ * Update Makefile.patch
- -- Mark Purcell <msp at debian.org> Tue, 1 Nov 2005 21:32:49 +0000
+ -- Mark Purcell <msp at debian.org> Tue, 1 Nov 2005 21:46:25 +0000
libpri (1.2.0-0beta1-1) experimental; urgency=low
Modified: libpri/trunk/debian/patches/00list
===================================================================
--- libpri/trunk/debian/patches/00list 2005-11-01 21:34:39 UTC (rev 932)
+++ libpri/trunk/debian/patches/00list 2005-11-01 21:47:20 UTC (rev 933)
@@ -1,2 +1 @@
Makefile.dpatch
-#bristuff-0.2.0-RC8l.dpatch
Modified: libpri/trunk/debian/patches/Makefile.dpatch
===================================================================
--- libpri/trunk/debian/patches/Makefile.dpatch 2005-11-01 21:34:39 UTC (rev 932)
+++ libpri/trunk/debian/patches/Makefile.dpatch 2005-11-01 21:47:20 UTC (rev 933)
@@ -1,28 +1,18 @@
#! /bin/sh /usr/share/dpatch/dpatch-run
-## Makefile.dpatch by Kilian Krause <kk at verfaction.de>
+## Makefile.dpatch by Mark Purcell <msp at debian.org>
##
## All lines beginning with `## DP:' are a description of the patch.
-## DP: imported old Makefile changes
@DPATCH@
-diff -urNad --exclude=CVS --exclude=.svn ./Makefile /tmp/dpep-work.medIPG/libpri-1.2.0~beta1/Makefile
---- ./Makefile 2005-07-27 14:14:05.000000000 +0100
-+++ /tmp/dpep-work.medIPG/libpri-1.2.0~beta1/Makefile 2005-08-30 19:59:58.000000000 +0100
-@@ -42,7 +42,7 @@
- INSTALL_PREFIX=
- INSTALL_BASE=/usr
- ifeq (${OSARCH},Linux)
--LDCONFIG_FLAGS=-n
-+LDCONFIG_FLAGS=#-n
+diff -urNad libpri-1.2.0-beta2~/Makefile libpri-1.2.0-beta2/Makefile
+--- libpri-1.2.0-beta2~/Makefile 2005-09-26 16:57:23.000000000 +0100
++++ libpri-1.2.0-beta2/Makefile 2005-11-01 21:42:10.000000000 +0000
+@@ -86,7 +86,7 @@
+ if [ -x /usr/sbin/sestatus ] && ( /usr/sbin/sestatus | grep "SELinux status:" | grep -q "enabled"); then restorecon -v $(INSTALL_PREFIX)$(INSTALL_BASE)/lib/$(DYNAMIC_LIBRARY); fi
+ ( cd $(INSTALL_PREFIX)$(INSTALL_BASE)/lib ; ln -sf libpri.so.1 libpri.so )
+ install -m 644 $(STATIC_LIBRARY) $(INSTALL_PREFIX)$(INSTALL_BASE)/lib
+- if test $$(id -u) = 0; then $(LDCONFIG); fi
++ if test $$(id -u) = 0; then $(LDCONFIG) $(LDCONFIG_FLAGS); fi
else
- ifeq (${OSARCH},FreeBSD)
- LDCONFIG_FLAGS=-m
-@@ -56,7 +56,7 @@
- INSTALL_BASE = /usr/local
- else
- SOFLAGS = -Wl,-soname,libpri.so.1
--LDCONFIG = /sbin/ldconfig
-+LDCONFIG = /sbin/ldconfig -n
- endif
-
- #The problem with sparc is the best stuff is in newer versions of gcc (post 3.0) only.
+ install -f $(INSTALL_PREFIX)$(INSTALL_BASE)/include -m 644 libpri.h
+ install -f $(INSTALL_PREFIX)$(INSTALL_BASE)/lib -m 755 $(DYNAMIC_LIBRARY)
Deleted: libpri/trunk/debian/patches/q931.dpatch
===================================================================
--- libpri/trunk/debian/patches/q931.dpatch 2005-11-01 21:34:39 UTC (rev 932)
+++ libpri/trunk/debian/patches/q931.dpatch 2005-11-01 21:47:20 UTC (rev 933)
@@ -1,156 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## q931.dpatch by Kilian Krause <kk at verfaction.de>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: imported old q931 changes
-
- at DPATCH@
---- libpri-1.0.4/q931.c 2004-10-05 04:19:11.000000000 +0200
-+++ libpri-1.0.4.debian/q931.c 2005-02-09 11:48:43.000000000 +0100
-@@ -36,7 +36,7 @@
-
- struct msgtype {
- int msgnum;
-- unsigned char *name;
-+ char *name;
- int mandies[MAX_MAND_IES];
- };
-
-@@ -775,7 +775,7 @@
-
- static FUNC_DUMP(dump_called_party_number)
- {
-- char cnum[256];
-+ unsigned char cnum[256];
-
- q931_get_number(cnum, sizeof(cnum), ie->data + 1, len - 3);
- pri_message("%c Called Number (len=%2d) [ Ext: %d TON: %s (%d) NPI: %s (%d) '%s' ]\n",
-@@ -784,7 +784,7 @@
-
- static FUNC_DUMP(dump_called_party_subaddr)
- {
-- char cnum[256];
-+ unsigned char cnum[256];
- q931_get_number(cnum, sizeof(cnum), ie->data + 1, len - 3);
- pri_message("%c Called Sub-Address (len=%2d) [ Ext: %d Type: %s (%d) O: %d '%s' ]\n",
- prefix, len, ie->data[0] >> 7,
-@@ -794,7 +794,7 @@
-
- static FUNC_DUMP(dump_calling_party_number)
- {
-- char cnum[256];
-+ unsigned char cnum[256];
- if (ie->data[0] & 0x80)
- q931_get_number(cnum, sizeof(cnum), ie->data + 1, len - 3);
- else
-@@ -808,7 +808,7 @@
-
- static FUNC_DUMP(dump_calling_party_subaddr)
- {
-- char cnum[256];
-+ unsigned char cnum[256];
- q931_get_number(cnum, sizeof(cnum), ie->data + 2, len - 4);
- pri_message("%c Calling Sub-Address (len=%2d) [ Ext: %d Type: %s (%d) O: %d '%s' ]\n",
- prefix, len, ie->data[0] >> 7,
-@@ -818,7 +818,7 @@
-
- static FUNC_DUMP(dump_redirecting_number)
- {
-- char cnum[256];
-+ unsigned char cnum[256];
- int i = 0;
- /* To follow Q.931 (4.5.1), we must search for start of octet 4 by
- walking through all bytes until one with ext bit (8) set to 1 */
-@@ -845,7 +845,7 @@
-
- static FUNC_DUMP(dump_connected_number)
- {
-- char cnum[256];
-+ unsigned char cnum[256];
- int i = 0;
- /* To follow Q.931 (4.5.1), we must search for start of octet 4 by
- walking through all bytes until one with ext bit (8) set to 1 */
-@@ -887,14 +887,14 @@
- }
- }
- while(!(ie->data[i++] & 0x80));
-- q931_get_number(call->redirectingnum, sizeof(call->redirectingnum), ie->data + i, ie->len - i);
-+ q931_get_number((unsigned char*)call->redirectingnum, sizeof(call->redirectingnum), ie->data + i, ie->len - i);
- return 0;
- }
-
-
- static FUNC_DUMP(dump_redirecting_subaddr)
- {
-- char cnum[256];
-+ unsigned char cnum[256];
- q931_get_number(cnum, sizeof(cnum), ie->data + 2, len - 4);
- pri_message("%c Redirecting Sub-Address (len=%2d) [ Ext: %d Type: %s (%d) O: %d '%s' ]\n",
- prefix, len, ie->data[0] >> 7,
-@@ -905,14 +905,14 @@
- static FUNC_RECV(receive_calling_party_subaddr)
- {
- /* copy digits to call->callingsubaddr */
-- q931_get_number(call->callingsubaddr, sizeof(call->callingsubaddr), ie->data + 2, len - 4);
-+ q931_get_number((unsigned char*)call->callingsubaddr, sizeof(call->callingsubaddr), ie->data + 2, len - 4);
- return 0;
- }
-
- static FUNC_RECV(receive_called_party_number)
- {
- /* copy digits to call->callednum */
-- q931_get_number(call->callednum, sizeof(call->callednum), ie->data + 1, len - 3);
-+ q931_get_number((unsigned char*)call->callednum, sizeof(call->callednum), ie->data + 1, len - 3);
- call->calledplan = ie->data[0] & 0x7f;
- return 0;
- }
-@@ -933,11 +933,11 @@
- extbit = (ie->data[0] >> 7) & 0x01;
-
- if (extbit) {
-- q931_get_number(call->callernum, sizeof(call->callernum), ie->data + 1, len - 3);
-+ q931_get_number((unsigned char*)call->callernum, sizeof(call->callernum), ie->data + 1, len - 3);
- call->callerpres = 0; /* PI presentation allowed
- SI user-provided, not screened */
- } else {
-- q931_get_number(call->callernum, sizeof(call->callernum), ie->data + 2, len - 4);
-+ q931_get_number((unsigned char*)call->callernum, sizeof(call->callernum), ie->data + 2, len - 4);
- call->callerpres = ie->data[1] & 0x7f;
- }
- return 0;
-@@ -966,7 +966,7 @@
- {
- call->useruserprotocoldisc = ie->data[0] & 0xff;
- if (call->useruserprotocoldisc == 4) /* IA5 */
-- q931_get_number(call->useruserinfo, sizeof(call->useruserinfo), ie->data + 1, len - 3);
-+ q931_get_number((unsigned char*)call->useruserinfo, sizeof(call->useruserinfo), ie->data + 1, len - 3);
- return 0;
- }
-
-@@ -1030,7 +1030,7 @@
- data++;
- len--;
- }
-- q931_get_number(call->callername, sizeof(call->callername), data, len - 2);
-+ q931_get_number((unsigned char*)call->callername, sizeof(call->callername), data, len - 2);
- return 0;
- }
-
-@@ -1064,7 +1064,7 @@
- return 0;
- }
- if (ie->data[13] + 14 == ie->len) {
-- q931_get_number(call->callername, sizeof(call->callername) - 1, ie->data + 14, ie->len - 14);
-+ q931_get_number((unsigned char*)call->callername, sizeof(call->callername) - 1, ie->data + 14, ie->len - 14);
- }
- return 0;
- }
-@@ -1859,7 +1859,7 @@
-
- static int send_message(struct pri *pri, q931_call *c, int msgtype, int ies[])
- {
-- unsigned char buf[1024];
-+ char buf[1024];
- q931_h *h;
- q931_mh *mh;
- int len;
More information about the Pkg-voip-commits
mailing list