fix source on patch

4 files changed, 56 insertions, 37 deletions

diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog
index 9dd84f2c2b24..5b855dc857fd 100644
--- a/dev-db/mysql/ChangeLog
+++ b/dev-db/mysql/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-db/mysql
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.65 2003/08/11 17:37:03 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.66 2003/08/18 03:14:02 robbat2 Exp $
+
+  17 Aug 2003; Robin H. Johnson <robbat2@gentoo.org> mysql-4.0.14-r1.ebuild,
+  files/mysql-4.0.14-r1-tcpd-vars-fix.diff:
+  fix source on patch mysql-4.0.14-r1.ebuild
 
   11 Aug 2003; Robin H. Johnson <robbat2@gentoo.org> mysql-4.0.14-r1.ebuild,
   files/mysql-4.0.14-r2-tcpd-vars-fix.diff:
diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index 842a387ca2b7..1fbfcd7109c0 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -1,42 +1,43 @@
+MD5 230f1fb1b0fedce4997ec435d06675e7 mysql-3.23.56.ebuild 6547
+MD5 6c05958c0152a8e982c4dae2a5f2b721 mysql-4.0.12.ebuild 6785
+MD5 52d7c99b0aca771c3ab4b4a09a479e81 mysql-4.0.14.ebuild 6920
+MD5 b1716c908bb6b91f9d95929d8882d362 mysql-3.23.52-r1.ebuild 5872
+MD5 d4a52a63a22a85cc61081c566c280698 mysql-4.0.13-r2.ebuild 6446
+MD5 c4c08247fbc22deb77ec37f637f1c3dc mysql-4.0.14-r1.ebuild 7034
+MD5 a3702a4c1f2b7118dcd12c8157f07009 mysql-3.23.57.ebuild 6550
+MD5 77096c068048c8aa3a30b61afbb2f4b7 mysql-4.0.13.ebuild 6605
+MD5 8eb695a2c9af3e8294053889c5e37405 mysql-4.0.13-r1.ebuild 6454
+MD5 598f9c612bdaf218de4248d070db697d ChangeLog 10703
+MD5 ce4117a2af67231e65427e94a12a3fad mysql-4.0.13-r3.ebuild 7129
+MD5 977be6c68f6231cbcf1febd3305ade5d files/mysql-4.0.14-r2-tcpd-vars-fix.diff 465
+MD5 4541e130a1b0fa90db8612973b0adb75 files/mysql-4.0-mysqld-safe-sh.diff 1477
+MD5 36aa23522b241aafdb833ac4f11c4fd1 files/mysql-4.0.4-install-db-sh.diff 1439
+MD5 6b6ee32d2f9f3030b5fcea0a2a9a5360 files/mysql-4.0.rc6 950
 MD5 015a823e06d7181373b0601e4a17c284 files/digest-mysql-3.23.52-r1 67
-MD5 0d15b78f60dc9d26e02923e591d39ea7 files/digest-mysql-4.0.13 66
-MD5 0d15b78f60dc9d26e02923e591d39ea7 files/digest-mysql-4.0.13-r1 66
-MD5 152b9a8feef16df47b56c316c5c0601e files/mysql-4.0.13-thrssl.patch 813
-MD5 dcd899fe185459da4cb9e71c75c3bda3 files/digest-mysql-3.23.57 67
-MD5 75e99b8e628e380551260d64553a9a10 files/my.cnf-4.0.14-r1 2813
-MD5 47c66444b6a1e2243eadf931d52d34b2 files/my.cnf 1229
-MD5 57531ccd19e17ccca95e0e3bf833cd67 files/mysql-3.23-db-3.2.3.diff 1105
-MD5 d3830060b3f74d6c0916ed85a6bbf02d files/mysql-3.23-install-db-sh.diff 1368
-MD5 7a5badec9c28c2f4d434d6aed0a5103b files/mysql-3.23-my-print-defaults.diff 218
 MD5 8eaeb1372c41d2fef1622dd707a7a9d0 files/mysql-3.23-nisam.h.diff 452
-MD5 8d51cbf3afa8349839380aa0986704c0 files/mysql-3.23-safe-mysqld-sh.diff 1557
-MD5 f49e58771365cb075ece153403811872 files/mysql-3.23.51-tcpd.patch 601
-MD5 50629599f478b26b4ca82c7c553feae0 files/mysql-3.23.52-install-db-sh.diff 1366
+MD5 d3830060b3f74d6c0916ed85a6bbf02d files/mysql-3.23-install-db-sh.diff 1368
+MD5 7d92ba9c74a73bf3c852a5c078c16d29 files/rebuilder.sh 1557
+MD5 a77a12a8e251ca0d82d3027b7b50c762 files/digest-mysql-4.0.12 1371
+MD5 0d15b78f60dc9d26e02923e591d39ea7 files/digest-mysql-4.0.13 66
+MD5 33666c6c9542fe3ef02379877f0c6bac files/digest-mysql-4.0.14 66
 MD5 ee578e3021841ef9dba4175403564136 files/mysql-4.0-db-3.2.1.diff 1047
+MD5 ff80a5d8d87212046e89f2f8ae779af4 files/mysql-4.0-nisam.h.diff 452
+MD5 afbf3b6821056a31ee09430933f8fb47 files/mysql.init 903
+MD5 f635289f8422fdf26ba3c3dbdf99c4e2 files/mysql-4.0.14-mysqld-safe-sh.diff 1503
 MD5 e68c5d7e3c48028c4cf7e55ea8396013 files/mysql-4.0-install-db-sh.diff 1271
+MD5 cfe027a0b863abadb46f75e4cf840c28 files/my.cnf 1228
+MD5 50629599f478b26b4ca82c7c553feae0 files/mysql-3.23.52-install-db-sh.diff 1366
 MD5 d1e79f7a155e45c69558f083fcb1139d files/mysql-4.0-my-print-defaults.diff 240
-MD5 4541e130a1b0fa90db8612973b0adb75 files/mysql-4.0-mysqld-safe-sh.diff 1477
-MD5 ff80a5d8d87212046e89f2f8ae779af4 files/mysql-4.0-nisam.h.diff 452
-MD5 36aa23522b241aafdb833ac4f11c4fd1 files/mysql-4.0.4-install-db-sh.diff 1439
-MD5 707d18c98dd9d86533b53330a2daadd2 files/mysql-4.0.rc6 951
-MD5 5bfc671c63667e6f4c8d48f9edc6076e files/mysql.init 904
+MD5 f49e58771365cb075ece153403811872 files/mysql-3.23.51-tcpd.patch 601
+MD5 8d51cbf3afa8349839380aa0986704c0 files/mysql-3.23-safe-mysqld-sh.diff 1557
+MD5 7a5badec9c28c2f4d434d6aed0a5103b files/mysql-3.23-my-print-defaults.diff 218
+MD5 296a01da527263926d20aca0446bc87d files/digest-mysql-3.23.56 67
+MD5 dcd899fe185459da4cb9e71c75c3bda3 files/digest-mysql-3.23.57 67
+MD5 977be6c68f6231cbcf1febd3305ade5d files/mysql-4.0.14-r1-tcpd-vars-fix.diff 465
+MD5 57531ccd19e17ccca95e0e3bf833cd67 files/mysql-3.23-db-3.2.3.diff 1105
+MD5 4c36e60ff941b21103df0acf1e6985b7 files/my.cnf-4.0.14-r1 2812
+MD5 0d15b78f60dc9d26e02923e591d39ea7 files/digest-mysql-4.0.13-r1 66
 MD5 0d15b78f60dc9d26e02923e591d39ea7 files/digest-mysql-4.0.13-r2 66
 MD5 0d15b78f60dc9d26e02923e591d39ea7 files/digest-mysql-4.0.13-r3 66
-MD5 33666c6c9542fe3ef02379877f0c6bac files/digest-mysql-4.0.14 66
-MD5 296a01da527263926d20aca0446bc87d files/digest-mysql-3.23.56 67
-MD5 a77a12a8e251ca0d82d3027b7b50c762 files/digest-mysql-4.0.12 1371
-MD5 7d92ba9c74a73bf3c852a5c078c16d29 files/rebuilder.sh 1557
-MD5 f635289f8422fdf26ba3c3dbdf99c4e2 files/mysql-4.0.14-mysqld-safe-sh.diff 1503
 MD5 33666c6c9542fe3ef02379877f0c6bac files/digest-mysql-4.0.14-r1 66
-MD5 977be6c68f6231cbcf1febd3305ade5d files/mysql-4.0.14-r2-tcpd-vars-fix.diff 465
-MD5 2d9fd1c37cc537963c5b77f2088a335c mysql-3.23.52-r1.ebuild 5873
-MD5 c63efd889b589a982ec42c3381e93d1a mysql-3.23.56.ebuild 6548
-MD5 f0015144c259bd17ac209d3ea53bdf52 mysql-3.23.57.ebuild 6551
-MD5 d10afc490dd01251501449f861cc1672 mysql-4.0.12.ebuild 6786
-MD5 ef9d142733c5cbab057fde6c6f4a154b mysql-4.0.13-r1.ebuild 6455
-MD5 f55c961be651653f3f8395eb105edb63 mysql-4.0.13-r2.ebuild 6447
-MD5 0bfb0f9d2e31652576c143d34162ecce ChangeLog 10537
-MD5 cd4e291088bded7e91a51f13743942e3 mysql-4.0.13-r3.ebuild 7130
-MD5 7d1c9dff15f373c9b1f7cc3023b67221 mysql-4.0.13.ebuild 6606
-MD5 44edd09c6a3168e652b6166a22d6cbb9 mysql-4.0.14.ebuild 6921
-MD5 6c90347f32748316f92e8a829b175b65 mysql-4.0.14-r1.ebuild 7034
+MD5 152b9a8feef16df47b56c316c5c0601e files/mysql-4.0.13-thrssl.patch 813
diff --git a/dev-db/mysql/files/mysql-4.0.14-r1-tcpd-vars-fix.diff b/dev-db/mysql/files/mysql-4.0.14-r1-tcpd-vars-fix.diff
new file mode 100644
index 000000000000..18fd9c87bb6d
--- /dev/null
+++ b/dev-db/mysql/files/mysql-4.0.14-r1-tcpd-vars-fix.diff
@@ -0,0 +1,14 @@
+diff -Naur orig/sql/mysqld.cc new/sql/mysqld.cc
+--- orig/sql/mysqld.cc  2003-06-10 22:22:10.000000000 +0200
++++ new/sql/mysqld.cc   2003-06-10 22:21:38.000000000 +0200
+@@ -101,8 +101,8 @@
+ #ifdef NEED_SYS_SYSLOG_H
+ #include <sys/syslog.h>
+ #endif /* NEED_SYS_SYSLOG_H */
+-int allow_severity = LOG_INFO;
+-int deny_severity = LOG_WARNING;
++//int allow_severity = LOG_INFO;
++//int deny_severity = LOG_WARNING;
+ 
+ #ifdef __STDC__
+ #define my_fromhost(A)    fromhost(A)
diff --git a/dev-db/mysql/mysql-4.0.14-r1.ebuild b/dev-db/mysql/mysql-4.0.14-r1.ebuild
index 9cc64d9d18c7..30e8cc002001 100644
--- a/dev-db/mysql/mysql-4.0.14-r1.ebuild
+++ b/dev-db/mysql/mysql-4.0.14-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.0.14-r1.ebuild,v 1.3 2003/08/15 13:01:51 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.0.14-r1.ebuild,v 1.4 2003/08/18 03:14:02 robbat2 Exp $
 
 #to accomodate -laadeedah releases
 NEWP=${P}
@@ -70,7 +70,7 @@ src_unpack() {
 	patch -p0 < ${FILESDIR}/${PN}-4.0.13-thrssl.patch || die
 
 	if use tcpd; then
-		patch -p1 -d ${S} < ${FILESDIR}/mysql-4.0.14-r2-tcpd-vars-fix.diff || die
+		patch -p1 -d ${S} < ${FILESDIR}/mysql-4.0.14-r1-tcpd-vars-fix.diff || die
 	fi
 }