Uploading to unstable shortly using this diff... -- Steve McIntyre, Cambridge, UK. [EMAIL PROTECTED] Armed with "Valor": "Centurion" represents quality of Discipline, Honor, Integrity and Loyalty. Now you don't have to be a Caesar to concord the digital world while feeling safe and proud.
diff -u ser-0.9.6/debian/changelog ser-0.9.6/debian/changelog
--- ser-0.9.6/debian/changelog
+++ ser-0.9.6/debian/changelog
@@ -1,3 +1,14 @@
+ser (0.9.6-1.1) unstable; urgency=medium
+
+ * NMU from the Zurich BSP for 2 RC bugs
+ * Fix up the compiler options in CFLAGS to allow compilation to work.
Closes: #384772 .
+ Thanks to Julien Blache for a patch.
+ * Fix up the AUG_CONFIGURATION macro in modules/postgres/aug_sysdep.h to work
+ on non-(i386|amd64) architectures. Closes: #390008 . Thanks again to
Julien Blache
+ for a patch.
+
+ -- Steve McIntyre <[EMAIL PROTECTED]> Sun, 8 Oct 2006 11:52:10 +0200
+
ser (0.9.6-1) unstable; urgency=low
[ Kilian Krause ]
diff -u ser-0.9.6/debian/rules ser-0.9.6/debian/rules
--- ser-0.9.6/debian/rules
+++ ser-0.9.6/debian/rules
@@ -55,7 +55,13 @@
ACC_MOD_PATH=$(addprefix modules/, $(ACC_MODULE))
+CFLAGS = -Wall
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+ CFLAGS += -O0
+else
+ CFLAGS += -O2
+endif
ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
CFLAGS += -g
@@ -64,6 +70,8 @@
INSTALL_PROGRAM += -s
endif
+export CFLAGS
+
configure: configure-stamp
configure-stamp:
dh_testdir
@@ -78,14 +86,14 @@
dh_testdir
# Add here commands to compile the package.
- $(MAKE) all skip_modules="$(EXCLUDED_MODULES)" cfg-target=/etc/ser/
- $(MAKE) modules modules="$(MYSQL_MOD_PATH)" cfg-target=/etc/ser/
- $(MAKE) modules modules="$(JABBER_MOD_PATH)" cfg-target=/etc/ser/
- $(MAKE) modules modules="$(RADIUS_MOD_PATH)" cfg-target=/etc/ser/
- $(MAKE) modules modules="$(CPL_MOD_PATH)" cfg-target=/etc/ser/
- $(MAKE) modules modules="$(PA_MOD_PATH)" cfg-target=/etc/ser/
+ CFLAGS="$(CFLAGS)" $(MAKE) all skip_modules="$(EXCLUDED_MODULES)"
cfg-target=/etc/ser/
+ CFLAGS="$(CFLAGS)" $(MAKE) modules modules="$(MYSQL_MOD_PATH)"
cfg-target=/etc/ser/
+ CFLAGS="$(CFLAGS)" $(MAKE) modules modules="$(JABBER_MOD_PATH)"
cfg-target=/etc/ser/
+ CFLAGS="$(CFLAGS)" $(MAKE) modules modules="$(RADIUS_MOD_PATH)"
cfg-target=/etc/ser/
+ CFLAGS="$(CFLAGS)" $(MAKE) modules modules="$(CPL_MOD_PATH)"
cfg-target=/etc/ser/
+ CFLAGS="$(CFLAGS)" $(MAKE) modules modules="$(PA_MOD_PATH)"
cfg-target=/etc/ser/
# postgres will generate lots of warnings
- $(MAKE) modules modules="$(POSTGRES_MOD_PATH)" cfg-target=/etc/ser/
+ CFLAGS="$(CFLAGS)" $(MAKE) modules modules="$(POSTGRES_MOD_PATH)"
cfg-target=/etc/ser/
# acc-db & acc-radius are compiled on install, because they share
# the same source tree with acc
#/usr/bin/docbook-to-man debian/ser.sgml > ser.1
only in patch2:
unchanged:
--- ser-0.9.6.orig/Makefile
+++ ser-0.9.6/Makefile
@@ -290,10 +290,10 @@
$(INSTALL-BIN) utils/serunix/serunix $(bin-prefix)/$(bin-dir)
utils/gen_ha1/gen_ha1:
- cd utils/gen_ha1; $(MAKE) all
+ cd utils/gen_ha1; CFLAGS="$(CFLAGS)" $(MAKE) all
utils/serunix/serunix:
- cd utils/serunix; $(MAKE) all
+ cd utils/serunix; CFLAGS="$(CFLAGS)" $(MAKE) all
install-modules: modules $(modules-prefix)/$(modules-dir)
[EMAIL PROTECTED] r in $(modules_full_path) "" ; do \
only in patch2:
unchanged:
--- ser-0.9.6.orig/Makefile.defs
+++ ser-0.9.6/Makefile.defs
@@ -464,8 +464,10 @@
found_lock_method=yes
endif
-CFLAGS=
+CFLAGS=$(shell echo "$${CFLAGS}")
LDFLAGS=
+
+ifeq (,$(CFLAGS))
# setting CFLAGS
ifeq ($(mode), release)
#if i386
@@ -903,6 +905,8 @@
endif #CC_NAME, gcc
endif #ARCH, ppc
+endif # CFLAGS not set
+
CFLAGS+= $(CC_EXTRA_OPTS)
@@ -932,7 +936,7 @@
# -andrei
else #mode,release
ifeq ($(CC_NAME), gcc)
- CFLAGS=-g -Wcast-align $(PROFILE)
+ CFLAGS+=-g -Wcast-align $(PROFILE)
ifeq ($(ARCH), sparc64)
CFLAGS+= -mcpu=ultrasparc
endif
only in patch2:
unchanged:
--- ser-0.9.6.orig/modules/postgres/aug_sysdep.h
+++ ser-0.9.6/modules/postgres/aug_sysdep.h
@@ -207,24 +207,12 @@
#define AUG_NO_PTHREADS
#endif
-#if defined(__i386)
-
-#if defined(__GNUC__)
-#define AUG_CONFIGURATION "Linux x86 with GCC"
-#endif
-
-typedef unsigned int augUInt32;
-
-#endif /* x86 */
-#if defined(__x86_64)
-
#if defined(__GNUC__)
-#define AUG_CONFIGURATION "Linux x86_64 with GCC"
+#define AUG_CONFIGURATION "Linux with GCC"
#endif
typedef unsigned int augUInt32;
-#endif /* x86-64 */
#endif /* linux */
/*
signature.asc
Description: Digital signature
