[Pkg-voip-commits] r9896 - in /yate/trunk/debian: ./ patches/
dekkers-guest at alioth.debian.org
dekkers-guest at alioth.debian.org
Mon Jul 9 15:35:56 UTC 2012
Author: dekkers-guest
Date: Mon Jul 9 15:35:55 2012
New Revision: 9896
URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=9896
Log:
* Switch to debhelper level 9, enable hardening and multiarch
(Closes: #680562)
- Add 0002-Compile-daemon-as-PIE.patch
* Do not call dh_installinit twice (Closes: #680563)
* Rewrite postinst and postrm
- Fix "unowned files after purge" (Closes: #527900)
* Run yate as the yate user, set cap_sys_nice so it can still run
threads with higher priority (Closes: #469729)
* Add logrotate file (Closes: #503624)
* Remove libh323 build-dependency and yate-h323chan package as h323 has
been disabled (Closes: #680818)
* Update Standards-Version to 3.9.3
Added:
yate/trunk/debian/patches/0002-Compile-daemon-as-PIE.patch
yate/trunk/debian/yate.logrotate
Modified:
yate/trunk/debian/changelog
yate/trunk/debian/compat
yate/trunk/debian/control
yate/trunk/debian/libyate4.1.0.install
yate/trunk/debian/patches/series
yate/trunk/debian/rules
yate/trunk/debian/yate-alsa.install
yate/trunk/debian/yate-core.install
yate/trunk/debian/yate-dahdi.install
yate/trunk/debian/yate-dev.install
yate/trunk/debian/yate-mysql.install
yate/trunk/debian/yate-pgsql.install
yate/trunk/debian/yate-qt4.install
yate/trunk/debian/yate-sctp.install
yate/trunk/debian/yate.init
yate/trunk/debian/yate.install
yate/trunk/debian/yate.postinst
yate/trunk/debian/yate.postrm
Modified: yate/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/yate/trunk/debian/changelog?rev=9896&op=diff
==============================================================================
--- yate/trunk/debian/changelog (original)
+++ yate/trunk/debian/changelog Mon Jul 9 15:35:55 2012
@@ -1,3 +1,20 @@
+yate (4.1.0-1~dfsg-3) UNRELEASED; urgency=low
+
+ * Switch to debhelper level 9, enable hardening and multiarch
+ (Closes: #680562)
+ - Add 0002-Compile-daemon-as-PIE.patch
+ * Do not call dh_installinit twice (Closes: #680563)
+ * Rewrite postinst and postrm
+ - Fix "unowned files after purge" (Closes: #527900)
+ * Run yate as the yate user, set cap_sys_nice so it can still run
+ threads with higher priority (Closes: #469729)
+ * Add logrotate file (Closes: #503624)
+ * Remove libh323 build-dependency and yate-h323chan package as h323 has
+ been disabled (Closes: #680818)
+ * Update Standards-Version to 3.9.3
+
+ -- Jeroen Dekkers <jeroen at dekkers.ch> Mon, 09 Jul 2012 17:24:00 +0200
+
yate (4.1.0-1~dfsg-2) unstable; urgency=low
* NEW package libyate4.1.0 match-soname
Modified: yate/trunk/debian/compat
URL: http://svn.debian.org/wsvn/pkg-voip/yate/trunk/debian/compat?rev=9896&op=diff
==============================================================================
--- yate/trunk/debian/compat (original)
+++ yate/trunk/debian/compat Mon Jul 9 15:35:55 2012
@@ -1,1 +1,1 @@
-7
+9
Modified: yate/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-voip/yate/trunk/debian/control?rev=9896&op=diff
==============================================================================
--- yate/trunk/debian/control (original)
+++ yate/trunk/debian/control Mon Jul 9 15:35:55 2012
@@ -3,10 +3,11 @@
Priority: optional
Maintainer: Debian VoIP Team <pkg-voip-maintainers at lists.alioth.debian.org>
Uploaders: Kilian Krause <kilian at debian.org>, Jose Carlos Garcia Sogo <jsogo at debian.org>, Mark Purcell <msp at debian.org>, Santiago Garcia Mantinan <manty at debian.org>, Mikael Magnusson <mikma at users.sourceforge.net>, Faidon Liambotis <paravoid at debian.org>, Tzafrir Cohen <tzafrir.cohen at xorcom.com>
-Build-Depends: debhelper (>= 8),
+Build-Depends: debhelper (>= 9),
+ dpkg-dev (>= 1.16.1~),
autotools-dev,
dh-autoreconf,
- libopenh323-dev | libh323plus-dev (>= 1.22.0~),
+# libh323plus-dev (>= 1.22.0~),
libgsm1-dev,
dahdi-source,
libmysqlclient-dev,
@@ -21,14 +22,14 @@
libspandsp-dev (>= 0.0.5~),
doxygen,
pkg-config
-Standards-Version: 3.9.2
+Standards-Version: 3.9.3
Homepage: http://yate.null.ro/
Vcs-Svn: svn://svn.debian.org/pkg-voip/yate/trunk/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-voip/yate/?op=log
Package: yate
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, yate-core (= ${binary:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, yate-core (= ${binary:Version}), libcap2-bin
Description: Yet Another Telephony Engine (YATE)
YATE is a telephony engine aimed at creating a telephony server that
performs well enough to deal with PBX requirements and also flexible
@@ -42,6 +43,7 @@
Replaces: libyate4.0.0
Conflicts: libyate4.0.0
Depends: ${shlibs:Depends}, ${misc:Depends}
+Pre-Depends: multiarch-support
Description: Shared library for YATE
YATE is a telephony engine aimed at creating a telephony server that
performs well enough to deal with PBX requirements and also flexible
@@ -103,15 +105,15 @@
.
These are the modules that require PostgreSQL.
-Package: yate-h323chan
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, yate-core (= ${binary:Version})
-Description: H323 module for YATE
- YATE is a telephony engine aimed at creating a telephony server that
- performs well enough to deal with PBX requirements and also flexible
- enough for complex Gateway and IVR solutions.
- .
- This is the H.323 protocol module.
+#Package: yate-h323chan
+#Architecture: any
+#Depends: ${shlibs:Depends}, ${misc:Depends}, yate-core (= ${binary:Version})
+#Description: H323 module for YATE
+# YATE is a telephony engine aimed at creating a telephony server that
+# performs well enough to deal with PBX requirements and also flexible
+# enough for complex Gateway and IVR solutions.
+# .
+# This is the H.323 protocol module.
Package: yate-qt4
Conflicts: yate-core (<< 4)
Modified: yate/trunk/debian/libyate4.1.0.install
URL: http://svn.debian.org/wsvn/pkg-voip/yate/trunk/debian/libyate4.1.0.install?rev=9896&op=diff
==============================================================================
--- yate/trunk/debian/libyate4.1.0.install (original)
+++ yate/trunk/debian/libyate4.1.0.install Mon Jul 9 15:35:55 2012
@@ -1,1 +1,1 @@
-usr/lib/libyate*.so.*
+usr/lib/*/libyate*.so.*
Added: yate/trunk/debian/patches/0002-Compile-daemon-as-PIE.patch
URL: http://svn.debian.org/wsvn/pkg-voip/yate/trunk/debian/patches/0002-Compile-daemon-as-PIE.patch?rev=9896&op=file
==============================================================================
--- yate/trunk/debian/patches/0002-Compile-daemon-as-PIE.patch (added)
+++ yate/trunk/debian/patches/0002-Compile-daemon-as-PIE.patch Mon Jul 9 15:35:55 2012
@@ -1,0 +1,20 @@
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -312,7 +312,7 @@
+ test -z "$$rev" || echo "$$rev" > packing/revision.txt
+
+ %.o: @srcdir@/%.cpp $(MKDEPS) @srcdir@/yatengine.h
+- $(COMPILE) -c $<
++ $(COMPILE) -fPIE -c $<
+
+ @srcdir@/configure: @srcdir@/configure.in
+ cd @srcdir@ && ./autogen.sh --silent
+@@ -324,7 +324,7 @@
+ ./config.status
+
+ yate: $(OBJS) $(LIBS) libyate.so
+- $(LINK) -o $@ $(LIBTHR) $^ @LIBS@
++ $(LINK) -fPIE -pie -o $@ $(LIBTHR) $^ @LIBS@
+
+ libyate.so: $(YLIB)
+ ln -sf $^ $@
Modified: yate/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/yate/trunk/debian/patches/series?rev=9896&op=diff
==============================================================================
--- yate/trunk/debian/patches/series (original)
+++ yate/trunk/debian/patches/series Mon Jul 9 15:35:55 2012
@@ -1,2 +1,3 @@
warning-unknown-architecture.patch
0001-Fix-parallel-make-v2.patch
+0002-Compile-daemon-as-PIE.patch
Modified: yate/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/yate/trunk/debian/rules?rev=9896&op=diff
==============================================================================
--- yate/trunk/debian/rules (original)
+++ yate/trunk/debian/rules Mon Jul 9 15:35:55 2012
@@ -1,4 +1,8 @@
#!/usr/bin/make -f
+
+export DEB_BUILD_MAINT_OPTIONS=hardening=+bindnow
+export DPKG_EXPORT_BUILDFLAGS = 1
+include /usr/share/dpkg/buildflags.mk
DEBVERSION:=$(shell head -n 1 debian/changelog \
| sed -e 's/^[^(]*(\([^)]*\)).*/\1/')
@@ -24,7 +28,7 @@
config.status: check-ilbc
dh_autoreconf --as-needed
dh_auto_configure --\
- --without-openh323 --disable-ilbc --without-amrnb --without-coredumper --enable-sctp
+ --without-openh323 --disable-ilbc --without-amrnb --without-coredumper --enable-sctp CFLAGS="$(CFLAGS) $(CPPFLAGS)"
build: build-arch build-indep
@@ -46,7 +50,6 @@
dh_testroot -i
dh_auto_install
dh_installlogrotate -i
- dh_installinit -i -- defaults 21
dh_installdocs -i
dh_installexamples -i -XCVS
dh_installcron -i
@@ -80,7 +83,6 @@
find $(subpacks) -name '*.conf' -type f -printf '-name %f -o\n' \
| xargs | sed -e 's/ -o$$//' | xargs find $(CURDIR)/debian/yate-core \
| xargs $(RM) -fv
- dh_installinit -a
dh_installman -a
dh_link -a
dh_strip -a
Modified: yate/trunk/debian/yate-alsa.install
URL: http://svn.debian.org/wsvn/pkg-voip/yate/trunk/debian/yate-alsa.install?rev=9896&op=diff
==============================================================================
--- yate/trunk/debian/yate-alsa.install (original)
+++ yate/trunk/debian/yate-alsa.install Mon Jul 9 15:35:55 2012
@@ -1,1 +1,1 @@
-usr/lib/yate/client/alsachan.yate
+usr/lib/*/yate/client/alsachan.yate
Modified: yate/trunk/debian/yate-core.install
URL: http://svn.debian.org/wsvn/pkg-voip/yate/trunk/debian/yate-core.install?rev=9896&op=diff
==============================================================================
--- yate/trunk/debian/yate-core.install (original)
+++ yate/trunk/debian/yate-core.install Mon Jul 9 15:35:55 2012
@@ -1,6 +1,6 @@
etc/yate/*.conf
-usr/lib/yate/*.yate
-usr/lib/yate/client/osschan.yate
-usr/lib/yate/client/jabberclient.yate
-usr/lib/yate/sig/
+usr/lib/*/yate/*.yate
+usr/lib/*/yate/client/osschan.yate
+usr/lib/*/yate/client/jabberclient.yate
+usr/lib/*/yate/sig/
usr/share/yate/data/*
Modified: yate/trunk/debian/yate-dahdi.install
URL: http://svn.debian.org/wsvn/pkg-voip/yate/trunk/debian/yate-dahdi.install?rev=9896&op=diff
==============================================================================
--- yate/trunk/debian/yate-dahdi.install (original)
+++ yate/trunk/debian/yate-dahdi.install Mon Jul 9 15:35:55 2012
@@ -1,3 +1,3 @@
-usr/lib/yate/server/zapcard.yate
+usr/lib/*/yate/server/zapcard.yate
etc/yate/zapcard.conf
Modified: yate/trunk/debian/yate-dev.install
URL: http://svn.debian.org/wsvn/pkg-voip/yate/trunk/debian/yate-dev.install?rev=9896&op=diff
==============================================================================
--- yate/trunk/debian/yate-dev.install (original)
+++ yate/trunk/debian/yate-dev.install Mon Jul 9 15:35:55 2012
@@ -1,5 +1,5 @@
usr/bin/yate-config
usr/share/man/man8/yate-config.*
usr/include/*
-usr/lib/libyate*.so
-usr/lib/pkgconfig/yate.pc
+usr/lib/*/libyate*.so
+usr/lib/*/pkgconfig/yate.pc
Modified: yate/trunk/debian/yate-mysql.install
URL: http://svn.debian.org/wsvn/pkg-voip/yate/trunk/debian/yate-mysql.install?rev=9896&op=diff
==============================================================================
--- yate/trunk/debian/yate-mysql.install (original)
+++ yate/trunk/debian/yate-mysql.install Mon Jul 9 15:35:55 2012
@@ -1,2 +1,2 @@
-usr/lib/yate/server/mysqldb.yate
+usr/lib/*/yate/server/mysqldb.yate
etc/yate/mysqldb.conf
Modified: yate/trunk/debian/yate-pgsql.install
URL: http://svn.debian.org/wsvn/pkg-voip/yate/trunk/debian/yate-pgsql.install?rev=9896&op=diff
==============================================================================
--- yate/trunk/debian/yate-pgsql.install (original)
+++ yate/trunk/debian/yate-pgsql.install Mon Jul 9 15:35:55 2012
@@ -1,2 +1,2 @@
-usr/lib/yate/server/pgsqldb.yate
+usr/lib/*/yate/server/pgsqldb.yate
etc/yate/pgsqldb.conf
Modified: yate/trunk/debian/yate-qt4.install
URL: http://svn.debian.org/wsvn/pkg-voip/yate/trunk/debian/yate-qt4.install?rev=9896&op=diff
==============================================================================
--- yate/trunk/debian/yate-qt4.install (original)
+++ yate/trunk/debian/yate-qt4.install Mon Jul 9 15:35:55 2012
@@ -1,5 +1,5 @@
usr/bin/yate-qt4
-usr/lib/yate/qt4/*.yate
+usr/lib/*/yate/qt4/*.yate
usr/lib/menu/yate-qt4.menu
usr/share/applications/yate-qt4.desktop
etc/yate/yate-qt4.conf
Modified: yate/trunk/debian/yate-sctp.install
URL: http://svn.debian.org/wsvn/pkg-voip/yate/trunk/debian/yate-sctp.install?rev=9896&op=diff
==============================================================================
--- yate/trunk/debian/yate-sctp.install (original)
+++ yate/trunk/debian/yate-sctp.install Mon Jul 9 15:35:55 2012
@@ -1,2 +1,2 @@
-usr/lib/yate/server/lksctp.yate
+usr/lib/*/yate/server/lksctp.yate
Modified: yate/trunk/debian/yate.init
URL: http://svn.debian.org/wsvn/pkg-voip/yate/trunk/debian/yate.init?rev=9896&op=diff
==============================================================================
--- yate/trunk/debian/yate.init (original)
+++ yate/trunk/debian/yate.init Mon Jul 9 15:35:55 2012
@@ -42,7 +42,7 @@
unset DISPLAY
start-stop-daemon --start --quiet --oknodo --pidfile $PIDFILE \
- --user $YATE_USER --group $YATE_GROUP \
+ --chuid $YATE_USER --group $YATE_GROUP \
--exec $DAEMON -- -p $PIDFILE $DAEMON_OPTS
echo "$NAME."
;;
@@ -61,7 +61,7 @@
sleep 1
start-stop-daemon --start --quiet --pidfile $PIDFILE \
- --user $YATE_USER --group $YATE_GROUP \
+ --chuid $YATE_USER --group $YATE_GROUP \
--exec $DAEMON -- -p $PIDFILE $DAEMON_OPTS
echo "$NAME."
;;
Modified: yate/trunk/debian/yate.install
URL: http://svn.debian.org/wsvn/pkg-voip/yate/trunk/debian/yate.install?rev=9896&op=diff
==============================================================================
--- yate/trunk/debian/yate.install (original)
+++ yate/trunk/debian/yate.install Mon Jul 9 15:35:55 2012
@@ -1,6 +1,6 @@
usr/bin/yate
-usr/lib/yate/server/*.yate
-usr/lib/yate/jabber/*.yate
-usr/lib/yate/sip/*.yate
+usr/lib/*/yate/server/*.yate
+usr/lib/*/yate/jabber/*.yate
+usr/lib/*/yate/sip/*.yate
usr/share/man/man8/yate.*
etc/yate/yate.conf
Added: yate/trunk/debian/yate.logrotate
URL: http://svn.debian.org/wsvn/pkg-voip/yate/trunk/debian/yate.logrotate?rev=9896&op=file
==============================================================================
--- yate/trunk/debian/yate.logrotate (added)
+++ yate/trunk/debian/yate.logrotate Mon Jul 9 15:35:55 2012
@@ -1,0 +1,11 @@
+/var/log/yate.log {
+ daily
+ rotate 7
+ missingok
+ notifempty
+ compress
+ create 640 yate yate
+ postrotate
+ [ -f /var/run/yate/yate.pid ] && kill -HUP `cat /var/run/yate/yate.pid`
+ endscript
+}
Modified: yate/trunk/debian/yate.postinst
URL: http://svn.debian.org/wsvn/pkg-voip/yate/trunk/debian/yate.postinst?rev=9896&op=diff
==============================================================================
--- yate/trunk/debian/yate.postinst (original)
+++ yate/trunk/debian/yate.postinst Mon Jul 9 15:35:55 2012
@@ -2,33 +2,30 @@
set -e
-if [ "$1" = "configure" ]; then
- if [ "$2" = "" ];then
- . /etc/default/yate
- echo "Creating/updating yate user account and group..."
- addgroup --system $YATE_GROUP || {
- # addgroup failed. Why?
- if ! getent group $YATE_GROUP >/dev/null ; then
- echo "Could not create system group $YATE_GROUP." >&2
- exit 1
- fi
- # well, the group is there, so just ignore the error
- }
- adduser --system --ingroup $YATE_GROUP --home /var/lib/yate \
- --gecos "YATE daemon" --shell /bin/sh \
- --disabled-password $YATE_USER || {
- # adduser failed. Why?
- if getent passwd $YATE_USER >/dev/null ; then
- echo "Non-system user $YATE_USER found. I will not overwrite a non-system" >&2
- echo "user. Remove the user and reinstall yate." >&2
- exit 1
- fi
- # unknown adduser error, simply exit
- exit 1
- }
- mkdir -p /var/lib/yate
- chown -R $YATE_USER.$YATE_GROUP /var/lib/yate
+case "$1" in
+ configure)
+ if ! getent group yate > /dev/null ; then
+ echo 'Adding system-groupr for yate' 1>&2
+ addgroup --system yate
fi
-fi
+
+ if ! getent passwd yate > /dev/null ; then
+ adduser --system --ingroup yate --home /var/lib/yate \
+ --gecos "YATE daemon" --shell /bin/sh \
+ --disabled-password yate
+ fi
+
+ mkdir -p /var/lib/yate
+ chown -R yate:yate /var/lib/yate
+ setcap cap_sys_nice=eip /usr/bin/yate
+ ;;
+
+ abort-upgrade|abort-remove|abort-deconfigure)
+ ;;
+
+ *)
+ echo "postinst called with unknown argument \`$1'" >&2
+ exit 0
+esac
#DEBHELPER#
Modified: yate/trunk/debian/yate.postrm
URL: http://svn.debian.org/wsvn/pkg-voip/yate/trunk/debian/yate.postrm?rev=9896&op=diff
==============================================================================
--- yate/trunk/debian/yate.postrm (original)
+++ yate/trunk/debian/yate.postrm Mon Jul 9 15:35:55 2012
@@ -2,13 +2,19 @@
set -e
-if [ "$1" = "remove" ]; then
- if [ "$2" = "purge" ];then
- . /etc/default/yate
- deluser --quiet --system $YATE_USER
- delgroup --quiet $YATE_GROUP
- rmdir --ignore-fail-on-non-empty /var/lib/yate
- fi
-fi
+case "$1" in
+ purge)
+ deluser --quiet --system yate || true
+ delgroup --quiet --system yate || true
+ rm -rf /var/lib/yate
+ ;;
+
+ remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
+ ;;
+
+ *)
+ echo "postrm called with unknown argument \`$1'" >&2
+ exit 0
+esac
#DEBHELPER#
More information about the Pkg-voip-commits
mailing list