[Pkg-voip-commits] r10081 - in /asterisk/branches/experimental/debian: changelog clean control patches/pjproject patches/series rules

[tzafrir at alioth.debian.org]

Author: tzafrir
Date: Wed Jan 23 13:22:03 2013
New Revision: 10081

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=10081
Log:
Builds; 11.2.1

* New upstream release: 11.2.1
  - Patch pjproject dropped: merged upstream.
* Modified rules file to be able to build pjproject (David Sarmiento)
* Updated build-deps (David Sarmiento)
* Disable hardening for now.
* Re-enabled pjproject

Added:
    asterisk/branches/experimental/debian/clean
Removed:
    asterisk/branches/experimental/debian/patches/pjproject
Modified:
    asterisk/branches/experimental/debian/changelog
    asterisk/branches/experimental/debian/control
    asterisk/branches/experimental/debian/patches/series
    asterisk/branches/experimental/debian/rules

Modified: asterisk/branches/experimental/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/branches/experimental/debian/changelog?rev=10081&op=diff
==============================================================================
--- asterisk/branches/experimental/debian/changelog (original)
+++ asterisk/branches/experimental/debian/changelog Wed Jan 23 13:22:03 2013
@@ -1,4 +1,4 @@
-asterisk (1:11.1.0~dfsg-1) UNRELEASED; urgency=low
+asterisk (1:11.2.1~dfsg-1) UNRELEASED; urgency=low
 
   [ Faidon Liambotis ]
   * New major upstream release.
@@ -15,8 +15,14 @@
     being unused for a while now.
 
   [ Tzafrir Cohen ]
-  * pjproject: the beast is disabled for now.
   * Patch undeprecate: undeprecate meetme.
+  * increased compat level for debian/clean.
+  * Disable hardening for now.
+
+  [ David Sarmiento ]
+  * Re-enabled pjproject
+  * Modified rules file to be able to build pjproject
+  * Updated build-deps
 
  -- Faidon Liambotis <paravoid at debian.org>  Mon, 24 Dec 2012 14:40:17 +0200
 

Added: asterisk/branches/experimental/debian/clean
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/branches/experimental/debian/clean?rev=10081&op=file
==============================================================================
--- asterisk/branches/experimental/debian/clean (added)
+++ asterisk/branches/experimental/debian/clean Wed Jan 23 13:22:03 2013
@@ -1,0 +1,15 @@
+res/pjproject/build.mak
+res/pjproject/build/cc-auto.mak
+res/pjproject/build/os-auto.mak
+res/pjproject/config.log
+res/pjproject/config.status
+res/pjproject/pjlib-util/build/os-auto.mak
+res/pjproject/pjlib/build/os-auto.mak
+res/pjproject/pjlib/include/pj/compat/m_auto.h
+res/pjproject/pjlib/include/pj/compat/os_auto.h
+res/pjproject/pjmedia/build/os-auto.mak
+res/pjproject/pjmedia/include/pjmedia-codec/config_auto.h
+res/pjproject/pjmedia/include/pjmedia/config_auto.h
+res/pjproject/pjsip/include/pjsip/sip_autoconf.h
+res/pjproject/third_party/build/os-auto.mak
+res/pjproject/third_party/build/portaudio/os-auto.mak

Modified: asterisk/branches/experimental/debian/control
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/branches/experimental/debian/control?rev=10081&op=diff
==============================================================================
--- asterisk/branches/experimental/debian/control (original)
+++ asterisk/branches/experimental/debian/control Wed Jan 23 13:22:03 2013
@@ -4,6 +4,7 @@
 Maintainer: Debian VoIP Team <pkg-voip-maintainers at lists.alioth.debian.org>
 Uploaders: Mark Purcell <msp at debian.org>, Tzafrir Cohen <tzafrir at debian.org>
 Build-Depends: debhelper (>= 6.0.7),
+ dpkg-dev (>= 1.16.1.1),
  lsb-base (>= 3.2-14),
  libreadline-dev | libreadline5-dev,
  libgsm1-dev,

Modified: asterisk/branches/experimental/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/branches/experimental/debian/patches/series?rev=10081&op=diff
==============================================================================
--- asterisk/branches/experimental/debian/patches/series (original)
+++ asterisk/branches/experimental/debian/patches/series Wed Jan 23 13:22:03 2013
@@ -20,5 +20,3 @@
 no_uname
 
 ilbc_disable
-# Not sure it's good, but it's applied in upstream:
-pjproject

Modified: asterisk/branches/experimental/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/branches/experimental/debian/rules?rev=10081&op=diff
==============================================================================
--- asterisk/branches/experimental/debian/rules (original)
+++ asterisk/branches/experimental/debian/rules Wed Jan 23 13:22:03 2013
@@ -1,6 +1,22 @@
 #!/usr/bin/make -f
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
+
+# Necessary to pass hardening flags to menuselect.
+# export CFLAGS LDFLAGS BUILD_CFLAGS BUILD_LDFLAGS
+
+# Starting with dpkg-dev >= 1.16.1.1 you can use the new buildflags.mk file
+# to set all *FLAGS
+# When building programs that handle untrusted data
+# (parsers, network listeners, etc.),
+#  or run with elevated privileges (PAM, X, etc.),
+#  please enable "PIE" and "BINDNOW" in the build.
+#  The "all" option enables "PIE" and "BINDNOW" and future hardening flags
+
+
+#export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+DPKG_EXPORT_BUILDFLAGS = 1
+include /usr/share/dpkg/buildflags.mk
 
 export DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
@@ -15,18 +31,6 @@
 BUILD_OS=$(shell dpkg-architecture -qDEB_BUILD_ARCH_OS)
 
 export PROC := $(shell dpkg-architecture -qDEB_BUILD_GNU_CPU)
-
-CFLAGS = `dpkg-buildflags --get CFLAGS`
-LDFLAGS = `dpkg-buildflags --get LDFLAGS`
-CFLAGS += `dpkg-buildflags --get CPPFLAGS`
-
-# For CFLAGS/LDFLAGS of menuselect:
-BUILD_CFLAGS = $(CFLAGS)
-BUILD_LDFLAGS = $(LDFLAGS)
-
-# Necessary to pass hardening flags to menuselect.
-export CFLAGS LDFLAGS BUILD_CFLAGS BUILD_LDFLAGS
-
 
 ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
 	BUILDFLAGS += OPTIMIZE=-O0