[SCM] Debian packaging of libnet-pcap-perl branch, master, updated. upstream/0.17-49-gefb0e6f

Xavier Guimard x.guimard at free.fr
Sat Mar 9 06:56:31 UTC 2013


The following commit has been merged in the master branch:
commit efb0e6fad870a5626c4105d07b0b848a66858df9
Author: Xavier Guimard <x.guimard at free.fr>
Date:   Sat Mar 9 07:55:56 2013 +0100

    Remove relro patch (debian/compat error)

diff --git a/debian/changelog b/debian/changelog
index f4834ec..aa524d1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,7 +15,6 @@ libnet-pcap-perl (0.17-1) unstable; urgency=low
   * Remove safe_signals patch now included in upstream
   * Add spelling patch (reported to RT)
   * Refresh ccflags patch
-  * Add patch to force -relro in LDFLAGS
 
  -- Xavier Guimard <x.guimard at free.fr>  Sat, 09 Mar 2013 07:51:28 +0100
 
diff --git a/debian/patches/0002-Add-relro-in-LDFLAGS.patch b/debian/patches/0002-Add-relro-in-LDFLAGS.patch
deleted file mode 100644
index 236bd2a..0000000
--- a/debian/patches/0002-Add-relro-in-LDFLAGS.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Description: force LDFLAGS to include hardening flags
-Author: Xavier Guimard <x.guimard at free.fr>
-Forwarded: not-needed
-Last-Update: 2013-03-09
-
---- a/Makefile.PL
-+++ b/Makefile.PL
-@@ -25,6 +25,7 @@
-     $options{CCFLAGS} = $Config{ccflags} . " -Wall -Wwrite-strings"
-         if $Config{ccname} eq "gcc" and $] >= 5.006;
-     $options{LIBS}    = '-lpcap';
-+    $options{LDDLFLAGS} = '-shared -fstack-protector -Wl,-z,relro';
- }
- 
- for my $arg (@ARGV) {
diff --git a/debian/patches/series b/debian/patches/series
index 8561f21..37a48ae 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 0001-Append-CCFLAGS-to-Config-ccflags-instead-of-overridi.patch
 spelling-errors.patch
-0002-Add-relro-in-LDFLAGS.patch

-- 
Debian packaging of libnet-pcap-perl



More information about the Pkg-perl-cvs-commits mailing list