summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDominik Stadler <centic@gentoo.org>2006-12-29 20:50:54 +0000
committerDominik Stadler <centic@gentoo.org>2006-12-29 20:50:54 +0000
commit7a760f13bf80e6f31f06f46f8cdb451e06178779 (patch)
tree801117ff9d1a23b8d94ee17a6ff95b0089c18829
parentremoved "ftexample" storage engine in 5.1 (diff)
downloadgentoo-2-7a760f13bf80e6f31f06f46f8cdb451e06178779.tar.gz
gentoo-2-7a760f13bf80e6f31f06f46f8cdb451e06178779.tar.bz2
gentoo-2-7a760f13bf80e6f31f06f46f8cdb451e06178779.zip
fix format of patch.
(Portage version: 2.1.2_rc2-r2)
-rw-r--r--net-firewall/firehol/ChangeLog6
-rw-r--r--net-firewall/firehol/files/firehol-1.226-to-250.patch29
2 files changed, 20 insertions, 15 deletions
diff --git a/net-firewall/firehol/ChangeLog b/net-firewall/firehol/ChangeLog
index a438eabb0cbb..34006cf2c0d9 100644
--- a/net-firewall/firehol/ChangeLog
+++ b/net-firewall/firehol/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-firewall/firehol
# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/firehol/ChangeLog,v 1.22 2006/12/28 20:59:13 centic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/firehol/ChangeLog,v 1.23 2006/12/29 20:50:54 centic Exp $
+
+ 29 Dec 2006; Dominik Stadler <centic@gentoo.org>
+ files/firehol-1.226-to-250.patch:
+ Fix invalid patch, not sure how this worked before for me.
*firehol-1.250 (27 Dec 2006)
diff --git a/net-firewall/firehol/files/firehol-1.226-to-250.patch b/net-firewall/firehol/files/firehol-1.226-to-250.patch
index 2e042f7f05be..a27116da8635 100644
--- a/net-firewall/firehol/files/firehol-1.226-to-250.patch
+++ b/net-firewall/firehol/files/firehol-1.226-to-250.patch
@@ -1,11 +1,12 @@
---- firehol.new 2006-12-27 14:13:39.000000000 +0100
-+++ firehol.sh 2006-12-27 14:15:57.000000000 +0100
+diff -Nur firehol-1.226/firehol.sh firehol-1.226.new/firehol.sh
+--- firehol-1.226/firehol.sh 2006-12-29 23:48:19.000000000 +0100
++++ firehol-1.226.new/firehol.sh 2006-12-29 23:49:40.000000000 +0100
@@ -10,7 +10,7 @@
#
# config: /etc/firehol/firehol.conf
#
--# $Id: firehol-1.226-to-250.patch,v 1.1 2006/12/28 20:59:13 centic Exp $
-+# $Id: firehol-1.226-to-250.patch,v 1.1 2006/12/28 20:59:13 centic Exp $
+-# $Id: firehol-1.226-to-250.patch,v 1.2 2006/12/29 20:50:54 centic Exp $
++# $Id: firehol-1.226-to-250.patch,v 1.2 2006/12/29 20:50:54 centic Exp $
#
# Make sure only root can run us.
@@ -105,8 +106,8 @@
# Find our minor version
firehol_minor_version() {
${CAT_CMD} <<"EOF" | ${CUT_CMD} -d ' ' -f 3 | ${CUT_CMD} -d '.' -f 2
--$Id: firehol-1.226-to-250.patch,v 1.1 2006/12/28 20:59:13 centic Exp $
-+$Id: firehol-1.226-to-250.patch,v 1.1 2006/12/28 20:59:13 centic Exp $
+-$Id: firehol-1.226-to-250.patch,v 1.2 2006/12/29 20:50:54 centic Exp $
++$Id: firehol-1.226-to-250.patch,v 1.2 2006/12/29 20:50:54 centic Exp $
EOF
}
@@ -670,8 +671,8 @@
else
${CAT_CMD} <<EOF
--$Id: firehol-1.226-to-250.patch,v 1.1 2006/12/28 20:59:13 centic Exp $
-+$Id: firehol-1.226-to-250.patch,v 1.1 2006/12/28 20:59:13 centic Exp $
+-$Id: firehol-1.226-to-250.patch,v 1.2 2006/12/29 20:50:54 centic Exp $
++$Id: firehol-1.226-to-250.patch,v 1.2 2006/12/29 20:50:54 centic Exp $
(C) Copyright 2003, Costa Tsaousis <costa@tsaousis.gr>
FireHOL is distributed under GPL.
@@ -679,8 +680,8 @@
${CAT_CMD} <<EOF
--$Id: firehol-1.226-to-250.patch,v 1.1 2006/12/28 20:59:13 centic Exp $
-+$Id: firehol-1.226-to-250.patch,v 1.1 2006/12/28 20:59:13 centic Exp $
+-$Id: firehol-1.226-to-250.patch,v 1.2 2006/12/29 20:50:54 centic Exp $
++$Id: firehol-1.226-to-250.patch,v 1.2 2006/12/29 20:50:54 centic Exp $
(C) Copyright 2003, Costa Tsaousis <costa@tsaousis.gr>
FireHOL is distributed under GPL.
Home Page: http://firehol.sourceforge.net
@@ -716,8 +717,8 @@
"${CAT_CMD}" >&2 <<EOF
--$Id: firehol-1.226-to-250.patch,v 1.1 2006/12/28 20:59:13 centic Exp $
-+$Id: firehol-1.226-to-250.patch,v 1.1 2006/12/28 20:59:13 centic Exp $
+-$Id: firehol-1.226-to-250.patch,v 1.2 2006/12/29 20:50:54 centic Exp $
++$Id: firehol-1.226-to-250.patch,v 1.2 2006/12/29 20:50:54 centic Exp $
(C) Copyright 2003, Costa Tsaousis <costa@tsaousis.gr>
FireHOL is distributed under GPL.
Home Page: http://firehol.sourceforge.net
@@ -725,8 +726,8 @@
echo "# "
${CAT_CMD} <<EOF
--# $Id: firehol-1.226-to-250.patch,v 1.1 2006/12/28 20:59:13 centic Exp $
-+# $Id: firehol-1.226-to-250.patch,v 1.1 2006/12/28 20:59:13 centic Exp $
+-# $Id: firehol-1.226-to-250.patch,v 1.2 2006/12/29 20:50:54 centic Exp $
++# $Id: firehol-1.226-to-250.patch,v 1.2 2006/12/29 20:50:54 centic Exp $
# (C) Copyright 2003, Costa Tsaousis <costa@tsaousis.gr>
# FireHOL is distributed under GPL.
# Home Page: http://firehol.sourceforge.net