[Pkg-voip-commits] r5428 - in /pwlib-titan/trunk/debian: changelog patches/04_names.dpatch rules
paravoid at alioth.debian.org
paravoid at alioth.debian.org
Tue Apr 1 06:42:19 UTC 2008
Author: paravoid
Date: Tue Apr 1 06:42:19 2008
New Revision: 5428
URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=5428
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.
* Revert part of 04_names patch to not include OBJDIR_SUFFIX to
plugins dir anymore.
Modified:
pwlib-titan/trunk/debian/changelog
pwlib-titan/trunk/debian/patches/04_names.dpatch
pwlib-titan/trunk/debian/rules
Modified: pwlib-titan/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/pwlib-titan/trunk/debian/changelog?rev=5428&op=diff
==============================================================================
--- pwlib-titan/trunk/debian/changelog (original)
+++ pwlib-titan/trunk/debian/changelog Tue Apr 1 06:42:19 2008
@@ -6,11 +6,16 @@
* 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: #454139).
+ * 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.
+ * Revert part of 04_names patch to not include OBJDIR_SUFFIX to
+ plugins dir anymore.
[ Faidon Liambotis ]
* Fix bug where shlibs were very strict on binNMUed versions.
- -- Faidon Liambotis <paravoid at debian.org> Tue, 01 Apr 2008 08:32:44 +0300
+ -- Faidon Liambotis <paravoid at debian.org> Tue, 01 Apr 2008 09:40:07 +0300
pwlib-titan (1.11.2-1) unstable; urgency=low
Modified: pwlib-titan/trunk/debian/patches/04_names.dpatch
URL: http://svn.debian.org/wsvn/pkg-voip/pwlib-titan/trunk/debian/patches/04_names.dpatch?rev=5428&op=diff
==============================================================================
--- pwlib-titan/trunk/debian/patches/04_names.dpatch (original)
+++ pwlib-titan/trunk/debian/patches/04_names.dpatch Tue Apr 1 06:42:19 2008
@@ -36,18 +36,6 @@
# distinguish betweek building and using pwlib
ifeq (,$(wildcard $(PWLIBDIR)/src))
-diff -urNad pwlib-1.10.3~dfsg~/make/plugins.mak pwlib-1.10.3~dfsg/make/plugins.mak
---- pwlib-1.10.3~dfsg~/make/plugins.mak 2006-01-08 15:16:15.000000000 +0000
-+++ pwlib-1.10.3~dfsg/make/plugins.mak 2007-05-20 10:55:06.000000000 +0000
-@@ -2,7 +2,7 @@
-
- PLUGIN_FILENAME = $(PLUGIN_NAME)_pwplugin.$(LIB_SUFFIX)
-
--OBJDIR = ../pwlib/$(PLUGIN_FAMILY)
-+OBJDIR = ../pwlib$(OBJDIR_SUFFIX)/$(PLUGIN_FAMILY)
-
- TARGET = $(OBJDIR)/$(PLUGIN_FILENAME)
-
diff -urNad pwlib-1.10.3~dfsg~/make/unix.mak pwlib-1.10.3~dfsg/make/unix.mak
--- pwlib-1.10.3~dfsg~/make/unix.mak 2007-05-20 10:52:38.000000000 +0000
+++ pwlib-1.10.3~dfsg/make/unix.mak 2007-05-20 10:52:38.000000000 +0000
Modified: pwlib-titan/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/pwlib-titan/trunk/debian/rules?rev=5428&op=diff
==============================================================================
--- pwlib-titan/trunk/debian/rules (original)
+++ pwlib-titan/trunk/debian/rules Tue Apr 1 06:42:19 2008
@@ -1,8 +1,4 @@
#!/usr/bin/make -f
-
-# excludes for the -ptrace and -develop version
-STRIP_EXCLUDES = -N$(PACKAGE) -N$(PACKAGE)-dbg -N$(PACKAGE)-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)
@@ -81,66 +77,41 @@
# --> 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
+ $(MAKE) PWLIBDIR=$(CURDIR) CFLAGS="$(CFLAGS) -DPTRACING=1" optshared
+ $(MAKE) PWLIBDIR=$(CURDIR) CFLAGS="$(CFLAGS) -DPTRACING=1" optnoshared
# 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
+ $(MAKE) PWLIBDIR=$(CURDIR) CFLAGS="$(CFLAGS) -DPTRACING=1" -C samples/hello_world/ optnoshared
+
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
+ $(MAKE) PWLIBDIR=$(CURDIR) CFLAGS="$(CFLAGS) -DPTRACING=1" -C samples/hello_world/ optshared
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
+ LD_LIBRARY_PATH=$(CURDIR)/lib samples/hello_world/obj_*_r/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
$(RM) -rf samples/hello_world/obj_*
cp debian/libpt-dev.dirs debian/$(PACKAGE)-dev.dirs
cp debian/libpt-dev.manpages debian/$(PACKAGE)-dev.manpages
+
touch build-arch-stamp
build-indep: build-indep-stamp
@@ -191,14 +162,9 @@
dh_testroot
dh_clean -k -a
dh_installdirs -a
-
- #INSTALL#
- 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/libpt.so.*.*.* $(CURDIR)/debian/$(PACKAGE)/usr/lib
cp debian/libpt.docs debian/$(PACKAGE).docs
# $(PACKAGE)-dbg (will be filled by dh_strip)
@@ -212,9 +178,7 @@
sed -i -e 's#$$(PWLIBDIR)/include/ptlib/unix#/usr/include/ptlib/unix#g' \
-e 's#$$(PWLIBDIR)/lib#/usr/lib#g' debian/$(PACKAGE)-dev/usr/share/pwlib/make/unix.mak
# copy static opt version to $(PACKAGE)-dev
- install -m 755 lib/notrace/libpt_s.a debian/$(PACKAGE)-dev/usr/lib
- install -m 755 lib/opt/libpt_s.a debian/$(PACKAGE)-dev/usr/lib/libpt_r_s.a
- install -m 755 lib/debug/libpt_s.a debian/$(PACKAGE)-dev/usr/lib/libpt_d_s.a
+ install -m 755 lib/libpt_s.a debian/libpt-dev/usr/lib/
find debian/$(PACKAGE)-dev/usr/include -type f -exec chmod 644 {} \;
# ptlib-config in $(PACKAGE)-dev
# changing build/machine dependent data in ptlib-config
@@ -244,57 +208,36 @@
-rm -f `find debian/$(PACKAGE)-dev/ -name "*.in"`
# plugins
+
#$(PACKAGE)-plugins-v4l
install -d -m 755 debian/$(PACKAGE)-plugins-v4l/usr/lib/pwlib/$(SHLIBSVER)/device/videoinput/
- cp plugins/pwlibn/device/videoinput/v4l_pwplugin.so \
+ cp plugins/pwlib/device/videoinput/v4l_pwplugin.so \
debian/$(PACKAGE)-plugins-v4l/usr/lib/pwlib/$(SHLIBSVER)/device/videoinput/
-
+
#$(PACKAGE)-plugins-v4l2
install -d -m 755 debian/$(PACKAGE)-plugins-v4l2/usr/lib/pwlib/$(SHLIBSVER)/device/videoinput/
- cp plugins/pwlibn/device/videoinput/v4l2_pwplugin.so \
+ cp plugins/pwlib/device/videoinput/v4l2_pwplugin.so \
debian/$(PACKAGE)-plugins-v4l2/usr/lib/pwlib/$(SHLIBSVER)/device/videoinput/
#$(PACKAGE)-plugins-avc
install -d -m 755 debian/$(PACKAGE)-plugins-avc/usr/lib/pwlib/$(SHLIBSVER)/device/videoinput/
- cp plugins/pwlibn/device/videoinput/avc_pwplugin.so \
+ cp plugins/pwlib/device/videoinput/avc_pwplugin.so \
debian/$(PACKAGE)-plugins-avc/usr/lib/pwlib/$(SHLIBSVER)/device/videoinput/
#$(PACKAGE)-plugins-dc
install -d -m 755 debian/$(PACKAGE)-plugins-dc/usr/lib/pwlib/$(SHLIBSVER)/device/videoinput/
- cp plugins/pwlibn/device/videoinput/dc_pwplugin.so \
+ cp plugins/pwlib/device/videoinput/dc_pwplugin.so \
debian/$(PACKAGE)-plugins-dc/usr/lib/pwlib/$(SHLIBSVER)/device/videoinput/
#$(PACKAGE)-plugins-oss
install -d -m 755 debian/$(PACKAGE)-plugins-oss/usr/lib/pwlib/$(SHLIBSVER)/device/sound/
- cp plugins/pwlibn/device/sound/oss_pwplugin.so \
+ cp plugins/pwlib/device/sound/oss_pwplugin.so \
debian/$(PACKAGE)-plugins-oss/usr/lib/pwlib/$(SHLIBSVER)/device/sound/
#$(PACKAGE)-plugins-alsa
install -d -m 755 debian/$(PACKAGE)-plugins-alsa/usr/lib/pwlib/$(SHLIBSVER)/device/sound/
- cp plugins/pwlibn/device/sound/alsa_pwplugin.so \
+ cp plugins/pwlib/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
@@ -309,17 +252,16 @@
else \
dh_installchangelogs ChangeLog; \
fi
-
+
# Remove all CVS sub-directories
find debian -name "CVS" -type d|xargs rm -rf
find debian -name .cvsignore -exec rm -f {} \;
-
+
dh_link
-
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
@@ -329,12 +271,9 @@
binary-strip:
dh_testdir
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
@@ -391,4 +330,4 @@
endif
binary: binary-arch binary-indep
-.PHONY: build clean clean-patched binary-indep binary-arch binary install install-indep install-arch debian/control
+.PHONY: build clean clean-patched binary-indep binary-arch binary install install-indep install-arch
More information about the Pkg-voip-commits
mailing list