Package: openvpn
Version: 2.1.0-3.0
Severity: normal
Tags: patch

Attached is a patch that takes the handling of DEB_BUILD_OPTIONS up to
latest policy specifications:

 - parellel=N
 - noopt

And actually applies the CFLAGS settings to the configure call.

-- System Information:
Debian Release: 5.0.5
  APT prefers stable
  APT policy: (500, 'stable'), (400, 'testing'), (300, 'unstable')
Architecture: amd64 (x86_64)

Kernel: Linux 2.6.32-5-amd64 (SMP w/2 CPU cores)
Locale: LANG=fr_LU.UTF-8, LC_CTYPE=fr_LU.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash

Versions of packages openvpn depends on:
ii  debconf [debconf-2.0]     1.5.24         Debian configuration management sy
ii  libc6                     2.11.2-2       Embedded GNU C Library: Shared lib
ii  liblzo2-2                 2.03-1         data compression library
ii  libpam0g                  1.0.1-5+lenny1 Pluggable Authentication Modules l
ii  libpkcs11-helper1         1.05-1         library that simplifies the intera
ii  libssl0.9.8               0.9.8o-1       SSL shared libraries
ii  net-tools                 1.60-22        The NET-3 networking toolkit
ii  openssl-blacklist         0.5-2          list of blacklisted OpenSSL RSA ke
ii  openvpn-blacklist         0.4            list of blacklisted OpenVPN RSA sh

openvpn recommends no packages.

Versions of packages openvpn suggests:
ii  openssl                 0.9.8g-15+lenny7 Secure Socket Layer (SSL) binary a
ii  resolvconf              1.46             name server information handler

-- debconf information excluded
diff -Nru openvpn-2.1.0/debian/rules openvpn-2.1.0/debian/rules
--- openvpn-2.1.0/debian/rules  2009-12-11 12:08:49.000000000 +0100
+++ openvpn-2.1.0/debian/rules  2010-08-07 13:04:06.000000000 +0200
@@ -13,9 +13,16 @@
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
+CFLAGS:=-g
 
-ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
-       CFLAGS += -g
+ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
+       CFLAGS += -O0
+else
+       CFLAGS += -O2
+endif
+ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+       NUMJOBS = $(patsubst parallel=%,%,$(filter 
parallel=%,$(DEB_BUILD_OPTIONS)))
+       MAKEFLAGS += -j$(NUMJOBS)
 endif
 ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
        INSTALL_PROGRAM += -s
@@ -24,8 +31,7 @@
 config.status: $(QUILT_STAMPFN)
        dh_testdir
        # Add here commands to configure the package.
-       ./configure --enable-pthread --enable-password-save 
--host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr 
--mandir=\$${prefix}/share/man --with-ifconfig-path=/sbin/ifconfig 
--with-route-path=/sbin/route
-
+       ./configure --enable-pthread --enable-password-save 
--host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr 
--mandir=\$${prefix}/share/man --with-ifconfig-path=/sbin/ifconfig 
--with-route-path=/sbin/route CFLAGS='$(CFLAGS)'
 
 build: build-stamp
 

Reply via email to