[Pkg-voip-commits] r5045 - in /pwlib/trunk/debian: changelog rules
kilian at alioth.debian.org
kilian at alioth.debian.org
Wed Dec 5 18:07:26 UTC 2007
Author: kilian
Date: Wed Dec 5 18:07:26 2007
New Revision: 5045
URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=5045
Log:
* Remove entire -ptrace and -debug build and leave only opt build with
PTRACE code as new binary library. Discussion with Robert Jongbloed proved
that there's no point shipping any other configuration.
Modified:
pwlib/trunk/debian/changelog
pwlib/trunk/debian/rules
Modified: pwlib/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/pwlib/trunk/debian/changelog?rev=5045&op=diff
==============================================================================
--- pwlib/trunk/debian/changelog (original)
+++ pwlib/trunk/debian/changelog Wed Dec 5 18:07:26 2007
@@ -11,8 +11,11 @@
* Fix remote denial of service vulnerability caused
by a call to PString::vsprintf if the used object already
contained more than 1000 characters (CVE-2007-4897; Closes: #454133).
-
- -- Kilian Krause <kilian at debian.org> Mon, 3 Dec 2007 13:53:34 +0100
+ * Remove entire -ptrace and -debug build and leave only opt build with
+ PTRACE code as new binary library. Discussion with Robert Jongbloed proved
+ that there's no point shipping any other configuration.
+
+ -- Kilian Krause <kilian at debian.org> Wed, 5 Dec 2007 19:06:14 +0100
pwlib (1.10.10-1) unstable; urgency=low
Modified: pwlib/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/pwlib/trunk/debian/rules?rev=5045&op=diff
==============================================================================
--- pwlib/trunk/debian/rules (original)
+++ pwlib/trunk/debian/rules Wed Dec 5 18:07:26 2007
@@ -1,10 +1,6 @@
#!/usr/bin/make -f
PACKAGE=libpt-1.10.10
-
-# excludes for the -ptrace and -develop version
-STRIP_EXCLUDES = -N$(PACKAGE) -N$(PACKAGE)-dbg -Nlibpt-dev -N$(PACKAGE)-plugins-alsa -N$(PACKAGE)-plugins-oss
-STRIP_EXCLUDES += -N$(PACKAGE)-plugins-v4l -N$(PACKAGE)-plugins-v4l2 -N$(PACKAGE)-plugins-avc -N$(PACKAGE)-plugins-dc
ifneq (,$(shell test -f version.h&&grep MAJOR_VERSION version.h))
VER_MAJOR := $(shell awk '/MAJOR_VERSION/ { print $$3 }' version.h 2>/dev/null)
@@ -82,60 +78,34 @@
# --> make/ptbuildopts.mak
# -> make/common.mak
# PTLIB_BASE=pt
- # 1. shared, high optimized: DEBUG=0 P_SHAREDLIB=1 OBJDIR_SUFFIX=n optshared
- # 2. static, high optimized: DEBUG=0 P_SHAREDLIB=0 OBJDIR_SUFFIX=n optnoshared
# CFLAGS += -DPTRACING=1
- # 3. shared, with ptrace but opt: DEBUG=0 P_SHAREDLIB=1 OBJDIR_SUFFIX=r optshared
- # 4. static, with ptrace but opt: DEBUG=0 P_SHAREDLIB=0 OBJDIR_SUFFIX=r optnoshared
- # 5. shared, with debug and ptrace: DEBUG=1 P_SHAREDLIB=1 OBJDIR_SUFFIX=d debugshared
- # 6. static, with debug and ptrace: DEBUG=1 P_SHAREDLIB=0 OBJDIR_SUFFIX=d debugnoshared
- $(MAKE) PWLIBDIR=$(CURDIR) CFLAGS="$(CFLAGS)" DEBUG= P_SHAREDLIB=1 OBJDIR_SUFFIX=n PW_LIBDIR=$(CURDIR)/lib/notrace optshared
- $(MAKE) PWLIBDIR=$(CURDIR) CFLAGS="$(CFLAGS)" DEBUG= P_SHAREDLIB=0 OBJDIR_SUFFIX=n PW_LIBDIR=$(CURDIR)/lib/notrace optnoshared
+ # 1. shared, with ptrace but opt: DEBUG=0 P_SHAREDLIB=1 OBJDIR_SUFFIX=r optshared
+ # 2. static, with ptrace but opt: DEBUG=0 P_SHAREDLIB=0 OBJDIR_SUFFIX=r optnoshared
# put CFLAGS to build with PTRACING code
$(MAKE) PWLIBDIR=$(CURDIR) CFLAGS="$(CFLAGS) -DPTRACING=1" DEBUG= P_SHAREDLIB=1 OBJDIR_SUFFIX=r PW_LIBDIR=$(CURDIR)/lib/opt optshared
$(MAKE) PWLIBDIR=$(CURDIR) CFLAGS="$(CFLAGS) -DPTRACING=1" DEBUG= P_SHAREDLIB=0 OBJDIR_SUFFIX=r PW_LIBDIR=$(CURDIR)/lib/opt optnoshared
- $(MAKE) PWLIBDIR=$(CURDIR) CFLAGS="$(CFLAGS) -DPTRACING=1" DEBUG=1 P_SHAREDLIB=1 OBJDIR_SUFFIX=d PW_LIBDIR=$(CURDIR)/lib/debug debugshared
- $(MAKE) PWLIBDIR=$(CURDIR) CFLAGS="$(CFLAGS) -DPTRACING=1" DEBUG=1 P_SHAREDLIB=0 OBJDIR_SUFFIX=d PW_LIBDIR=$(CURDIR)/lib/debug debugnoshared
# then we ensure that the fresh build works with hello world.
# ...in static
$(MAKE) PWLIBDIR=$(CURDIR) -C samples/hello_world/ clean
$(RM) -rf samples/hello_world/obj_*
- $(MAKE) PWLIBDIR=$(CURDIR) CFLAGS="$(CFLAGS)" -C samples/hello_world/ DEBUG= P_SHAREDLIB=0 OBJDIR_SUFFIX=n PW_LIBDIR=$(CURDIR)/lib/notrace optnoshared
# put CFLAGS to build with PTRACING code
$(MAKE) PWLIBDIR=$(CURDIR) CFLAGS="$(CFLAGS) -DPTRACING=1" -C samples/hello_world/ DEBUG= P_SHAREDLIB=0 OBJDIR_SUFFIX=r PW_LIBDIR=$(CURDIR)/lib/opt optnoshared
- $(MAKE) PWLIBDIR=$(CURDIR) CFLAGS="$(CFLAGS) -DPTRACING=1" -C samples/hello_world/ DEBUG=1 P_SHAREDLIB=0 OBJDIR_SUFFIX=d PW_LIBDIR=$(CURDIR)/lib/debug debugnoshared
-
- samples/hello_world/obj_*_n/hello
- samples/hello_world/obj_*_d/hello
+
samples/hello_world/obj_*_r/hello
# ...and in shared..
$(MAKE) PWLIBDIR=$(CURDIR) -C samples/hello_world/ clean
$(RM) -rf samples/hello_world/obj_*
- $(MAKE) PWLIBDIR=$(CURDIR) CFLAGS="$(CFLAGS)" -C samples/hello_world/ DEBUG= P_SHAREDLIB=1 OBJDIR_SUFFIX=n PW_LIBDIR=$(CURDIR)/lib/notrace optshared
$(MAKE) PWLIBDIR=$(CURDIR) CFLAGS="$(CFLAGS) -DPTRACING=1" -C samples/hello_world/ DEBUG= P_SHAREDLIB=1 OBJDIR_SUFFIX=r PW_LIBDIR=$(CURDIR)/lib/opt optshared
- $(MAKE) PWLIBDIR=$(CURDIR) CFLAGS="$(CFLAGS) -DPTRACING=1" -C samples/hello_world/ DEBUG=1 P_SHAREDLIB=1 OBJDIR_SUFFIX=d PW_LIBDIR=$(CURDIR)/lib/debug debugshared
- if (samples/hello_world/obj_*_d/hello 2>/dev/null);then \
- echo debug hello_world sample incorrectly compiled static; false ; \
- else \
- echo debug hello_world sample correctly compiled non-static; \
- fi
- LD_LIBRARY_PATH=$(CURDIR)/lib/debug/ samples/hello_world/obj_*_d/hello
if (samples/hello_world/obj_*_r/hello 2>/dev/null);then \
echo opt hello_world sample incorrectly compiled static; false ; \
else \
echo opt hello_world sample correctly compiled non-static; \
fi
LD_LIBRARY_PATH=$(CURDIR)/lib/opt samples/hello_world/obj_*_r/hello
- if (samples/hello_world/obj_*_n/hello 2>/dev/null);then \
- echo opt hello_world sample incorrectly compiled static; false ; \
- else \
- echo opt hello_world sample correctly compiled non-static; \
- fi
- LD_LIBRARY_PATH=$(CURDIR)/lib/notrace samples/hello_world/obj_*_n/hello
# if this won't work, we needn't even try going any further...
# cleanup to make sure we don't install any of the samples we just compiled
$(MAKE) PWLIBDIR=$(CURDIR) -C samples/hello_world/ clean
@@ -191,12 +161,8 @@
dh_clean -k -a
dh_installdirs -a
- install -d -m 755 $(CURDIR)/debian/$(PACKAGE)/usr/lib \
- $(CURDIR)/debian/$(PACKAGE)-ptrace/usr/lib \
- $(CURDIR)/debian/$(PACKAGE)-develop/usr/lib
- install -m 755 lib/notrace/libpt.so.*.*.* $(CURDIR)/debian/$(PACKAGE)/usr/lib
- install -m 755 lib/opt/libpt.so.*.*.* $(CURDIR)/debian/$(PACKAGE)-ptrace/usr/lib
- install -m 755 lib/debug/libpt.so.*.*.* $(CURDIR)/debian/$(PACKAGE)-develop/usr/lib
+ install -d -m 755 $(CURDIR)/debian/$(PACKAGE)/usr/lib
+ install -m 755 lib/opt/libpt.so.*.*.* $(CURDIR)/debian/$(PACKAGE)/usr/lib
cp debian/libpt.docs debian/$(PACKAGE).docs
# $(PACKAGE)-dbg (will be filled by dh_strip)
@@ -210,9 +176,7 @@
sed -i -e 's#$$(PWLIBDIR)/include/ptlib/unix#/usr/include/ptlib/unix#g' \
-e 's#$$(PWLIBDIR)/lib#/usr/lib#g' debian/libpt-dev/usr/share/pwlib/make/unix.mak
# copy static opt version to libpt-dev
- install -m 755 lib/notrace/libpt_s.a debian/libpt-dev/usr/lib
- install -m 755 lib/opt/libpt_s.a debian/libpt-dev/usr/lib/libpt_r_s.a
- install -m 755 lib/debug/libpt_s.a debian/libpt-dev/usr/lib/libpt_d_s.a
+ install -m 755 lib/opt/libpt_s.a debian/libpt-dev/usr/lib/
find debian/libpt-dev/usr/include -type f -exec chmod 644 {} \;
# ptlib-config in libpt-dev
# changing build/machine dependent data in ptlib-config
@@ -271,28 +235,6 @@
install -d -m 755 debian/$(PACKAGE)-plugins-alsa/usr/lib/pwlib/$(SHLIBSVER)/device/sound/
cp plugins/pwlibn/device/sound/alsa_pwplugin.so \
debian/$(PACKAGE)-plugins-alsa/usr/lib/pwlib/$(SHLIBSVER)/device/sound/
-
- install -d -m 755 debian/$(PACKAGE)-ptrace/usr/lib/pwlib/$(SHLIBSVER)/device/videoinput/
- install -d -m 755 debian/$(PACKAGE)-ptrace/usr/lib/pwlib/$(SHLIBSVER)/device/sound/
- install -d -m 755 debian/$(PACKAGE)-develop/usr/lib/pwlib/$(SHLIBSVER)/device/videoinput/
- install -d -m 755 debian/$(PACKAGE)-develop/usr/lib/pwlib/$(SHLIBSVER)/device/sound/
- for video in v4l v4l2 avc dc;do \
- cp plugins/pwlibr/device/videoinput/$${video}_pwplugin.so \
- debian/$(PACKAGE)-ptrace/usr/lib/pwlib/$(SHLIBSVER)/device/videoinput/ ;\
- done; \
- for sound in oss alsa;do \
- cp plugins/pwlibr/device/sound/$${sound}_pwplugin.so \
- debian/$(PACKAGE)-ptrace/usr/lib/pwlib/$(SHLIBSVER)/device/sound/ ;\
- done
- for video in v4l v4l2 avc dc;do \
- cp plugins/pwlibd/device/videoinput/$${video}_pwplugin.so \
- debian/$(PACKAGE)-develop/usr/lib/pwlib/$(SHLIBSVER)/device/videoinput/ ;\
- done; \
- for sound in oss alsa;do \
- cp plugins/pwlibd/device/sound/$${sound}_pwplugin.so \
- debian/$(PACKAGE)-develop/usr/lib/pwlib/$(SHLIBSVER)/device/sound/; \
- done
-
# Must not depend on anything. This is to be called by
# binary-arch/binary-multi
@@ -312,7 +254,7 @@
dh_compress
dh_fixperms
# a new variable will be needed if an epoch is introduced to our versioning
- dh_makeshlibs -V '$(PACKAGE) (>= $(UPVERSION)~) | $(PACKAGE)-ptrace (>= $(UPVERSION)~) | $(PACKAGE)-develop (>= $(UPVERSION)~)'
+ dh_makeshlibs -V '$(PACKAGE) (>= $(UPVERSION)~)'
dh_installdeb
dh_shlibdeps -L $(PACKAGE) -l debian/$(PACKAGE)/usr/lib
dh_gencontrol
@@ -324,10 +266,7 @@
dh_testroot
ifneq (4,$(DH_COMPAT))
- dh_strip -N$(PACKAGE)-dbg -N$(PACKAGE)-ptrace -N$(PACKAGE)-develop --dbg-package=$(PACKAGE)-dbg
- # can't ship those in $(PACKAGE)-dbg due to namespace overlap
- dh_strip -p$(PACKAGE)-ptrace $(STRIP_EXCLUDES) -N$(PACKAGE)-develop --dbg-package=$(PACKAGE)-ptrace
- dh_strip -p$(PACKAGE)-develop $(STRIP_EXCLUDES) -N$(PACKAGE)-ptrace --dbg-package=$(PACKAGE)-develop
+ dh_strip -N$(PACKAGE)-dbg --dbg-package=$(PACKAGE)-dbg
else
# As dh_strip does not work fine for multiple binary package
# we need to workaround that manually
More information about the Pkg-voip-commits
mailing list