[apache2] 01/01: remove dbm_read_hash_or_btree.patch

[Stefan Fritsch]

This is an automated email from the git hooks/post-receive script.

sf pushed a commit to branch master
in repository apache2.

commit 9acc5b523a4562e0c991d5d8f9eb0d91a2b11e01
Author: Stefan Fritsch <sf at sfritsch.de>
Date:   Mon Aug 12 10:26:07 2013 +0200

    remove dbm_read_hash_or_btree.patch
    
    dbmmanage is not installed anymore
---
 debian/patches/dbm_read_hash_or_btree.patch |   35 ---------------------------
 debian/patches/series                       |    1 -
 2 files changed, 36 deletions(-)

diff --git a/debian/patches/dbm_read_hash_or_btree.patch b/debian/patches/dbm_read_hash_or_btree.patch
deleted file mode 100644
index 5e8689a..0000000
--- a/debian/patches/dbm_read_hash_or_btree.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Description: Be more liberal in the sorts of DBM files we accept.
-Forwarded: no
-Author: Adam Conrad <adconrad at 0c3.net>
-Last-Update: 2012-02-25
---- a/support/dbmmanage.in
-+++ b/support/dbmmanage.in
-@@ -25,7 +25,7 @@
- BEGIN { @AnyDBM_File::ISA = qw(DB_File NDBM_File GDBM_File SDBM_File) }
- use strict;
- use Fcntl;
--use AnyDBM_File ();
-+use DB_File ();
- 
- sub usage {
-     my $cmds = join "|", sort keys %dbmc::;
-@@ -155,7 +155,9 @@
- my($mode, $flags) = $command =~
-     /^(?:view|check)$/ ? (0644, O_RDONLY) : (0644, O_RDWR|O_CREAT);
- 
--tie (%DB, "AnyDBM_File", $file, $flags, $mode) || die "Can't tie $file: $!";
-+tie (%DB, "DB_File", $file, $flags, $mode, $DB_File::DB_HASH) ||
-+    tie (%DB, "DB_File", $file, $flags, $mode, $DB_File::DB_BTREE) ||
-+    die "Can't tie $file: $!";
- dbmc->$command();
- untie %DB;
- 
-@@ -167,7 +169,7 @@
-         srand (time ^ $$ or time ^ ($$ + ($$ << 15)));
-     }
-     else {
--        for (qw(-xlwwa -le)) {
-+        for (qw(xlwwa -le)) {
-             `ps $_ 2>/dev/null`;
-             $psf = $_, last unless $?;
-         }
diff --git a/debian/patches/series b/debian/patches/series
index 0fd38a8..019f931 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,7 +1,6 @@
 #make_include_safe.patch # Probably to be droped in 2.4
 fhs_compliance.patch
 #suexec_is_shared.patch # Probably not needed in 2.4
-dbm_read_hash_or_btree.patch
 no_LD_LIBRARY_PATH.patch
 suexec-CVE-2007-1742.patch
 customize_apxs.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-apache/apache2.git