summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Elio Pettenò <flameeyes@gentoo.org>2008-11-17 22:51:27 +0000
committerDiego Elio Pettenò <flameeyes@gentoo.org>2008-11-17 22:51:27 +0000
commit2744de9cf043c2414e5f9b589488f2fee8bdd5c0 (patch)
treea2593d6bb76bd22e4b89db2625c7070cef12949f
parentfix DOS line endings in patch so that it works with the stable version of pat... (diff)
downloadhistorical-2744de9cf043c2414e5f9b589488f2fee8bdd5c0.tar.gz
historical-2744de9cf043c2414e5f9b589488f2fee8bdd5c0.tar.bz2
historical-2744de9cf043c2414e5f9b589488f2fee8bdd5c0.zip
Fix patch with absolute paths.
Package-Manager: portage-2.2_rc14/cvs/Linux 2.6.27-gentoo-r2 x86_64
-rw-r--r--sys-apps/kbd/ChangeLog6
-rw-r--r--sys-apps/kbd/files/kbd-1.12-debian.patch20
-rw-r--r--sys-apps/shadow/ChangeLog6
-rw-r--r--sys-apps/shadow/files/shadow-4.1.1-audit.patch4
-rw-r--r--sys-apps/ucspi-tcp/ChangeLog6
-rw-r--r--sys-apps/ucspi-tcp/files/0.88-errno.patch4
-rw-r--r--sys-apps/util-linux/ChangeLog6
-rw-r--r--sys-apps/util-linux/files/util-linux-2.12q-debian-10cfdisk.patch5
8 files changed, 36 insertions, 21 deletions
diff --git a/sys-apps/kbd/ChangeLog b/sys-apps/kbd/ChangeLog
index 1ecad7380fba..ca21736e1455 100644
--- a/sys-apps/kbd/ChangeLog
+++ b/sys-apps/kbd/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sys-apps/kbd
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/kbd/ChangeLog,v 1.76 2008/09/23 07:20:38 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kbd/ChangeLog,v 1.77 2008/11/17 22:48:07 flameeyes Exp $
+
+ 17 Nov 2008; Diego E. Pettenò <flameeyes@gentoo.org>
+ files/kbd-1.12-debian.patch:
+ Fix patch with absolute paths.
23 Sep 2008; Markus Rothe <corsair@gentoo.org> kbd-1.14.1-r1.ebuild:
Stable on ppc
diff --git a/sys-apps/kbd/files/kbd-1.12-debian.patch b/sys-apps/kbd/files/kbd-1.12-debian.patch
index de1e402e7047..c6bf3c1e0009 100644
--- a/sys-apps/kbd/files/kbd-1.12-debian.patch
+++ b/sys-apps/kbd/files/kbd-1.12-debian.patch
@@ -1,5 +1,5 @@
-diff -urNad /home/wart/Projects/debian/kbd/new/kbd-1.12/src/loadkeys.y kbd-1.12/src/loadkeys.y
---- /home/wart/Projects/debian/kbd/new/kbd-1.12/src/loadkeys.y 2004-01-27 14:25:50.000000000 +0300
+diff -urNad kbd-1.12.orig/src/loadkeys.y kbd-1.12/src/loadkeys.y
+--- kbd-1.12.orig/src/loadkeys.y 2004-01-27 14:25:50.000000000 +0300
+++ kbd-1.12/src/loadkeys.y 2004-01-27 14:37:01.000000000 +0300
@@ -566,7 +566,7 @@
}
@@ -10,8 +10,8 @@ diff -urNad /home/wart/Projects/debian/kbd/new/kbd-1.12/src/loadkeys.y kbd-1.12/
extern FILE *findfile(char *fnam, char **dirpath, char **suffixes);
#undef yywrap
-diff -urNad /opt/tmp/kbd-1.12/src/loadunimap.c kbd-1.12/src/loadunimap.c
---- /opt/tmp/kbd-1.12/src/loadunimap.c 2004-08-02 22:57:25.000000000 +0200
+diff -urNad kbd-1.12.orig/src/loadunimap.c kbd-1.12/src/loadunimap.c
+--- kbd-1.12.orig/src/loadunimap.c 2004-08-02 22:57:25.000000000 +0200
+++ kbd-1.12/src/loadunimap.c 2004-08-02 22:57:44.000000000 +0200
@@ -28,8 +28,8 @@
extern char *progname;
@@ -24,8 +24,8 @@ diff -urNad /opt/tmp/kbd-1.12/src/loadunimap.c kbd-1.12/src/loadunimap.c
#ifdef MAIN
#include "version.h"
-diff -urNad /opt/tmp/kbd-1.12/src/getunimap.c kbd-1.12/src/getunimap.c
---- /opt/tmp/kbd-1.12/src/getunimap.c 2004-08-01 20:33:38.000000000 +0200
+diff -urNad kbd-1.12.orig/src/getunimap.c kbd-1.12/src/getunimap.c
+--- kbd-1.12.orig/src/getunimap.c 2004-08-01 20:33:38.000000000 +0200
+++ kbd-1.12/src/getunimap.c 2004-08-02 22:45:30.000000000 +0200
@@ -62,7 +62,7 @@
}
@@ -36,8 +36,8 @@ diff -urNad /opt/tmp/kbd-1.12/src/getunimap.c kbd-1.12/src/getunimap.c
usage();
fd = getfd(console);
-diff -urNad /opt/tmp/kbd-1.12/src/loadunimap.c kbd-1.12/src/loadunimap.c
---- /opt/tmp/kbd-1.12/src/loadunimap.c 2004-08-02 22:45:06.000000000 +0200
+diff -urNad kbd-1.12.orig/src/loadunimap.c kbd-1.12/src/loadunimap.c
+--- kbd-1.12.orig/src/loadunimap.c 2004-08-02 22:45:06.000000000 +0200
+++ kbd-1.12/src/loadunimap.c 2004-08-02 22:46:39.000000000 +0200
@@ -73,18 +73,18 @@
}
@@ -61,8 +61,8 @@ diff -urNad /opt/tmp/kbd-1.12/src/loadunimap.c kbd-1.12/src/loadunimap.c
infnam = argv[optind];
loadunicodemap(fd, infnam);
exit(0);
-diff -urNad /opt/tmp/kbd-1.12/src/showconsolefont.c kbd-1.12/src/showconsolefont.c
---- /opt/tmp/kbd-1.12/src/showconsolefont.c 2004-08-02 22:44:30.000000000 +0200
+diff -urNad kbd-1.12.orig/src/showconsolefont.c kbd-1.12/src/showconsolefont.c
+--- kbd-1.12.orig/src/showconsolefont.c 2004-08-02 22:44:30.000000000 +0200
+++ kbd-1.12/src/showconsolefont.c 2004-08-02 22:47:07.000000000 +0200
@@ -135,7 +135,7 @@
}
diff --git a/sys-apps/shadow/ChangeLog b/sys-apps/shadow/ChangeLog
index 38f33fb23958..7583f0d3c207 100644
--- a/sys-apps/shadow/ChangeLog
+++ b/sys-apps/shadow/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sys-apps/shadow
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/ChangeLog,v 1.207 2008/08/23 06:23:29 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/ChangeLog,v 1.208 2008/11/17 22:49:54 flameeyes Exp $
+
+ 17 Nov 2008; Diego E. Pettenò <flameeyes@gentoo.org>
+ files/shadow-4.1.1-audit.patch:
+ Fix patch with absolute paths.
23 Aug 2008; Doug Goldstein <cardoe@gentoo.org> metadata.xml:
add GLEP 56 USE flag desc from use.local.desc
diff --git a/sys-apps/shadow/files/shadow-4.1.1-audit.patch b/sys-apps/shadow/files/shadow-4.1.1-audit.patch
index 1a4c95ae58bb..5968279f872f 100644
--- a/sys-apps/shadow/files/shadow-4.1.1-audit.patch
+++ b/sys-apps/shadow/files/shadow-4.1.1-audit.patch
@@ -1,5 +1,5 @@
---- /upstream/trunk/src/newgrp.c 2008/04/16 22:03:43 1975
-+++ upstream/trunk/src/newgrp.c 2008/04/16 22:04:46 1976
+--- a/trunk/src/newgrp.c 2008/04/16 22:03:43 1975
++++ b/trunk/src/newgrp.c 2008/04/16 22:04:46 1976
@@ -53,6 +53,10 @@
static char *Prog;
static int is_newgrp;
diff --git a/sys-apps/ucspi-tcp/ChangeLog b/sys-apps/ucspi-tcp/ChangeLog
index 3ed816df90e9..b17e647a00dc 100644
--- a/sys-apps/ucspi-tcp/ChangeLog
+++ b/sys-apps/ucspi-tcp/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sys-apps/ucspi-tcp
# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/ucspi-tcp/ChangeLog,v 1.62 2008/04/12 09:12:32 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/ucspi-tcp/ChangeLog,v 1.63 2008/11/17 22:50:43 flameeyes Exp $
+
+ 17 Nov 2008; Diego E. Pettenò <flameeyes@gentoo.org>
+ files/0.88-errno.patch:
+ Fix patch with absolute paths.
12 Apr 2008; nixnut <nixnut@gentoo.org> ucspi-tcp-0.88-r16.ebuild:
Stable on ppc wrt bug 215071
diff --git a/sys-apps/ucspi-tcp/files/0.88-errno.patch b/sys-apps/ucspi-tcp/files/0.88-errno.patch
index eef4d35c5b13..76d53c34bf78 100644
--- a/sys-apps/ucspi-tcp/files/0.88-errno.patch
+++ b/sys-apps/ucspi-tcp/files/0.88-errno.patch
@@ -1,5 +1,5 @@
---- error.h 2000-03-18 10:18:42.000000000 -0500
-+++ /error.h 2003-03-05 15:36:47.000000000 -0500
+--- a/error.h 2000-03-18 10:18:42.000000000 -0500
++++ b/error.h 2003-03-05 15:36:47.000000000 -0500
@@ -1,7 +1,7 @@
#ifndef ERROR_H
#define ERROR_H
diff --git a/sys-apps/util-linux/ChangeLog b/sys-apps/util-linux/ChangeLog
index 1242c296f3a9..005c41d47cb8 100644
--- a/sys-apps/util-linux/ChangeLog
+++ b/sys-apps/util-linux/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sys-apps/util-linux
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/ChangeLog,v 1.245 2008/10/26 03:16:47 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/ChangeLog,v 1.246 2008/11/17 22:51:27 flameeyes Exp $
+
+ 17 Nov 2008; Diego E. Pettenò <flameeyes@gentoo.org>
+ files/util-linux-2.12q-debian-10cfdisk.patch:
+ Fix patch with absolute paths.
26 Oct 2008; Mike Frysinger <vapier@gentoo.org> files/crypto-loop.initd:
Apply POSIX patch #236858.
diff --git a/sys-apps/util-linux/files/util-linux-2.12q-debian-10cfdisk.patch b/sys-apps/util-linux/files/util-linux-2.12q-debian-10cfdisk.patch
index 6105fb1ddfca..9092e0be9b33 100644
--- a/sys-apps/util-linux/files/util-linux-2.12q-debian-10cfdisk.patch
+++ b/sys-apps/util-linux/files/util-linux-2.12q-debian-10cfdisk.patch
@@ -1,4 +1,3 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
## 10cfdisk.dpatch by LaMont Jones <lamont@debian.org>
##
## All lines beginning with `## DP:' are a description of the patch.
@@ -6,8 +5,8 @@
@DPATCH@
diff -urNad util-linux/fdisk/cfdisk.c /tmp/dpep.rEB26p/util-linux/fdisk/cfdisk.c
---- util-linux/fdisk/cfdisk.c 2004-12-24 14:41:20.000000000 -0700
-+++ /tmp/dpep.rEB26p/util-linux/fdisk/cfdisk.c 2004-12-24 15:00:00.503453740 -0700
+--- util-linux.orig/fdisk/cfdisk.c 2004-12-24 14:41:20.000000000 -0700
++++ util-linux/fdisk/cfdisk.c 2004-12-24 15:00:00.503453740 -0700
@@ -2100,7 +2100,7 @@
if (to_file) {
if ((fp = fopen(fname, "w")) == NULL) {