Drop obsolete patches

Package-Manager: portage-2.2.0_alpha125/cvs/Linux x86_64

4 files changed, 6 insertions, 129 deletions

diff --git a/net-misc/vtun/ChangeLog b/net-misc/vtun/ChangeLog
index 3a25b7663687..b8690df16227 100644
--- a/net-misc/vtun/ChangeLog
+++ b/net-misc/vtun/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/vtun
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vtun/ChangeLog,v 1.50 2012/08/30 18:44:35 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vtun/ChangeLog,v 1.51 2012/09/16 12:12:02 pinkbyte Exp $
+
+  16 Sep 2012; Sergey Popov <pinkbyte@gentoo.org> -files/vtun-2.6-lzo2.patch,
+  -files/vtun-2.6-makefile.patch:
+  Drop obsolete patches
 
   30 Aug 2012; Sergey Popov <pinkbyte@gentoo.org> metadata.xml:
   Set correct email address, drop proxy maintainer
diff --git a/net-misc/vtun/Manifest b/net-misc/vtun/Manifest
index cc20d970455e..00bcfeca51df 100644
--- a/net-misc/vtun/Manifest
+++ b/net-misc/vtun/Manifest
@@ -1,5 +1,3 @@
-AUX vtun-2.6-lzo2.patch 2547 SHA256 3ed5678005e3b8ed7d9f0174174652b91a43041dbacf86f5cfa7de965d507568 SHA512 8ea02335e5b5bf3c26c2e29ecca3ddf4caebecc930be6995ddadda606c6a8bf850a9f2b8a598c1dc07b5b858765d47b2be9615cc135c23fc94ca9c94f2c5ca9c WHIRLPOOL f97b9df13b43cdcab7528c367f1850d2fa05dc7adf154d804469219f4486712843776bdb34c3dbfe6e6f987ebfb84c3ef8703ffd52cfab3cbfd1533a5d07ad1a
-AUX vtun-2.6-makefile.patch 1919 SHA256 a26d2dd9e7ecb591a822f01ce2ce2bf7f5e7d9e80b45b05f665e63c12cc17653 SHA512 58c8c68b1626797417a31ecb80d13ae58c91f57c3c9fa5689e230339555b76b2d995b199519eacae2617fe6e8dea306112712a964cbcbfb2efe60aab9ae9889e WHIRLPOOL 77e340490522ed318ce37cb9178b7a97ee0ef56b68edc79c84ca98e9f8b26e418af928b826ac4863cfc7183b5e56966c116e75bd42fe5def8e0af06d004b4231
 AUX vtun-3.0.2-build-racing-condition-fix.patch 563 SHA256 0dc70be4d65a3253e8eaecc3b5d0d0dc8ef52e023d9064fb85b488153c9ec92a SHA512 0a218bf157fa7cc20b7aa12c89e465453a80d497fcfee312b62df40c13954276a0b3b31e0929f1ad308512a799543cbe7b1ca6fff27b3c031e91b236d18597f2 WHIRLPOOL 41f3aeca992d1f4076593ac69a8a81e302d5ff3efea3d7c18f65d2cfe37253990af5a20d5ae7c764847b82145bdefd81a44ce279cdb82ff6fe15f62a679afc63
 AUX vtun-3.0.2-includes.patch 2020 SHA256 8dd0204c480437b0c09488d6af70c36ded639bf61eb1aae37e82e0039f39a915 SHA512 6a85c05ae7ee22fb576f2d889af75823a2ddd696f2271bed43fab26075443a0dc38b4132ffd69c5c2dc9e9333e73415c9311d5a183cf549fa2f681ec3bf185f9 WHIRLPOOL 1c25e86066ead30bd31ae0b7bddf1685b93a4dbcd8ba23834d17919b15d40c9365b72fa72324af311606baed7aa75e26a278497dee1796a88c4d19501187a478
 AUX vtun-3.0.2-remove-config-presence-check.patch 513 SHA256 12c14f8b556a262e908a0285475fc8fb84b282745332aedf3bff43b9654af91d SHA512 7e2f0e220801201080bbf256588d30790344aad44603012805bef39748636c2f599796289c6872251d926cc01e96f86203ddb40414e9ec77aac95423d3b8f9f9 WHIRLPOOL ec87507bd79049c060bc53e49168ecdd8f31cd294f8efb88aa064124a395ab4a695c40f7e51909664314ef59dfa2bbe2f3d870913b8871ba3c284f6552f6dd09
@@ -8,5 +6,5 @@ AUX vtund-start.conf 1174 SHA256 fce23e42500ac4b2135dfd4940388e4d05c117bba12446a
 DIST vtun-3.0.2.tar.gz 125777 SHA256 db26d4dbc35a2b3d65519f68b8ae55c80d7ec4e6569aeec7a432aa82f24c56d6 SHA512 1cf15ca7856c74318f921d9a6c4b47b10fd1aa69e12a223d41c6c41e570333beb825d37d3aea4217d305bb37f53c5beff70081079516d809068f8024dc8a039f WHIRLPOOL ee72023902f2e4688ac84c0e1d9c5a3ad6982fb847dcf162ecd2f12efac0abeaeb11344b0a34322a4ad6f0adabcd986dff9546f98174a7f201c9b87e5ccb5c72
 EBUILD vtun-3.0.2-r1.ebuild 1411 SHA256 8c12bd06ab12712a64eb78452b963484a0496a2040e77de9346fc7e7cfb5d182 SHA512 3244fae7f17df4083db309d945d77691d2ceeaa7c654220918646ccd961a7cdb9dbe3304ab44aa642dd8b1dffdce20ded466716e207e6278ae689ef609230849 WHIRLPOOL ff8325e1d5ee9c88302fa018f5b8a4b63688a51d67905997660ef26b0fcb1c82e0d02afbdb73e3118f147b0bd15a1b8085b49b3ae9310c2490871c6d6300e89c
 EBUILD vtun-3.0.2-r2.ebuild 1425 SHA256 f7ec1e3f5d658d6791868db5dce99adf911e6325d33a63ecfc79304413c3eb02 SHA512 561fba83938f7d854f6dff1fbcdf29a598d56a3ddd176711041174e224d4471d914913595af8654b3a01e6501c8f9c496ffcd78f2c6c7dffec5bb523008cb358 WHIRLPOOL 52a999b5207cf5bd0f3e10755d5033fa92416aa706a01e3d40ac8d506755e02af297ed0496cd66564edee6a2363d6f431aef5b0cd8be5489c0c68951a337faf5
-MISC ChangeLog 6655 SHA256 ce23b6594b3f5b8ca1da13ef54f4c651f66cd43fabd809d8c2188bcc9119897d SHA512 e898fb007d85765dd49e86a879ebc6a6cbbe08f3cb2c794b07db7c43005113fa9fb402038c2a8326d6e75c1f2f7fe3427e11543382befc5ba01d1d3e85e4d24d WHIRLPOOL 24d5b10026da912b266b3c291c6f4d18c480685d61c3618bd2cca980e9fe8d02f24e2b4e8b1dec174d4357f38deb3a5af7d5d4b65d6df56409557f06d171d353
+MISC ChangeLog 6792 SHA256 512f394a830981b792a383ae56f2e7bbbd944f05ee7cfa0cfe7e000013dc75bf SHA512 07b776de66a4ce37665351bb61ede067376c67049466479cbd5f5ad95d3cc0e37483e6eaad4ead5d1991de753e7c470569675a4d22d9997665e12e984c695378 WHIRLPOOL 22692c18bf5418a16e7765c8494386552f3debf00c4f609458215b9a1fa33ade347cc19036cc01a427b77a51fad8eabb3fe83e2ecbdbc09cbdb8c80fc8fcb3ab
 MISC metadata.xml 233 SHA256 a93cf5c4e554b97b2a48b92f801e3a3d87833cac311db0160a387a757ab7054c SHA512 704c94018edcbc53edcf0a41c2603dd59ea217aa5871f35d4d17f7df26156b8fb0a735d2efb11b74256565db01e6790a833242de39c29a9e46ed8ed96d505334 WHIRLPOOL 57f455cf256b91fb72e642f5a861e7367961775f2ab992b8afc798ff376c9a2bc8860d09f2bc43c870531248484128c966f25a081b7789a31ba9fb4f52b5519c
diff --git a/net-misc/vtun/files/vtun-2.6-lzo2.patch b/net-misc/vtun/files/vtun-2.6-lzo2.patch
deleted file mode 100644
index 7cc82cf65ba1..000000000000
--- a/net-misc/vtun/files/vtun-2.6-lzo2.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-diff -ru vtun.orig/configure vtun/configure
---- vtun.orig/configure	2002-12-21 04:22:15.000000000 +1100
-+++ vtun/configure	2005-11-13 16:57:22.000000000 +1100
-@@ -2001,14 +2001,14 @@
- 	  CPPFLAGS="$CPPFLAGS -I$p"
- 	fi
-         echo "$ac_t""($dir) yes " 1>&6 
--	echo $ac_n "checking for lzo1x_decompress in -llzo""... $ac_c" 1>&6
--echo "configure:2006: checking for lzo1x_decompress in -llzo" >&5
--ac_lib_var=`echo lzo'_'lzo1x_decompress | sed 'y%./+-%__p_%'`
-+	echo $ac_n "checking for lzo1x_decompress in -llzo2""... $ac_c" 1>&6
-+echo "configure:2006: checking for lzo1x_decompress in -llzo2" >&5
-+ac_lib_var=`echo lzo2'_'lzo1x_decompress | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   ac_save_LIBS="$LIBS"
--LIBS="-llzo  $LIBS"
-+LIBS="-llzo2  $LIBS"
- cat > conftest.$ac_ext <<EOF
- #line 2014 "configure"
- #include "confdefs.h"
-@@ -2037,7 +2037,7 @@
- if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-   echo "$ac_t""yes" 1>&6
-   
--	       LIBS="$LIBS -llzo"
-+	       LIBS="$LIBS -llzo2"
- 	       cat >> confdefs.h <<\EOF
- #define HAVE_LZO 1
- EOF
-@@ -2437,7 +2437,7 @@
- echo "$ac_t""" 1>&6
- 
- 
--REL=`echo 'REL-2_6' | tr -d '$: \-' | sed 's/^[A-Za-z]*//' | sed 's/\_/\./'`
-+REL=`echo '$Name:  $' | tr -d '$: \-' | sed 's/^[A-Za-z]*//' | sed 's/\_/\./'`
- 
- 
- cat >> confdefs.h <<EOF
-diff -ru vtun.orig/configure.in vtun/configure.in
---- vtun.orig/configure.in	2002-12-21 04:13:03.000000000 +1100
-+++ vtun/configure.in	2005-11-13 16:56:59.000000000 +1100
-@@ -119,9 +119,9 @@
-    AC_CHECKING( for LZO Library and Header files ... )
-    AC_SEARCH_HEADERS(lzo1x.h, 
- 	$LZO_HDR_DIR /usr/include/lzo "" /usr/local/include,
--        AC_CHECK_LIB(lzo, lzo1x_decompress,
-+        AC_CHECK_LIB(lzo2, lzo1x_decompress,
- 	    [
--	       LIBS="$LIBS -llzo"
-+	       LIBS="$LIBS -llzo2"
- 	       AC_DEFINE(HAVE_LZO)
- 	    ],
- 	    AC_MSG_ERROR( LZO library not found. )
-diff -ru vtun.orig/lfd_lzo.c vtun/lfd_lzo.c
---- vtun.orig/lfd_lzo.c	2002-04-25 19:19:50.000000000 +1000
-+++ vtun/lfd_lzo.c	2005-11-13 17:01:46.000000000 +1100
-@@ -74,7 +74,7 @@
- 	vtun_syslog(LOG_ERR,"Can't allocate buffer for the compressor");
- 	return 1;
-      }	
--     if( !(wmem = lzo_malloc(mem)) ){
-+     if( !(wmem = malloc(mem)) ){
- 	vtun_syslog(LOG_ERR,"Can't allocate buffer for the compressor");
- 	return 1;
-      }	
-@@ -92,7 +92,7 @@
- int free_lzo()
- {
-      lfd_free(zbuf); zbuf = NULL;
--     lzo_free(wmem); wmem = NULL;
-+     free(wmem); wmem = NULL;
-      return 0;
- }
- 
diff --git a/net-misc/vtun/files/vtun-2.6-makefile.patch b/net-misc/vtun/files/vtun-2.6-makefile.patch
deleted file mode 100644
index 673ee527ce2d..000000000000
--- a/net-misc/vtun/files/vtun-2.6-makefile.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-diff -Naur vtun.orig/Makefile.in vtun/Makefile.in
---- vtun.orig/Makefile.in	2002-12-20 16:55:47.000000000 +0000
-+++ vtun/Makefile.in	2003-10-17 18:03:42.000000000 +0000
-@@ -28,7 +28,7 @@
- LEXFLAGS = -t 
- 
- INSTALL = @INSTALL@
--INSTALL_OWNER = -o root -g 0
-+DESTDIR =
- 
- prefix = @prefix@
- exec_prefix = @exec_prefix@
-@@ -77,24 +77,21 @@
- 	rm -f `cat vtun.drivers`	
- 
- install_man: 
--	$(INSTALL) -d -m 755 $(INSTALL_OWNER) $(DESTDIR)$(MAN_DIR)/man8
--	$(INSTALL) -m 644 $(INSTALL_OWNER) vtund.8 $(DESTDIR)$(MAN_DIR)/man8
--	$(INSTALL) -d -m 755 $(INSTALL_OWNER) $(DESTDIR)$(MAN_DIR)/man5
--	$(INSTALL) -m 644 $(INSTALL_OWNER) vtund.conf.5 $(DESTDIR)$(MAN_DIR)/man5
--	rm -f $(DESTDIR)$(MAN_DIR)/man8/vtun.8 
--	ln -s vtund.8 $(DESTDIR)$(MAN_DIR)/man8/vtun.8 
-+	$(INSTALL) -d -m 755 $(DESTDIR)$(MAN_DIR)/man8
-+	$(INSTALL) -m 644 vtund.8 $(DESTDIR)$(MAN_DIR)/man8
-+	$(INSTALL) -d -m 755 $(DESTDIR)$(MAN_DIR)/man5
-+	$(INSTALL) -m 644 vtund.conf.5 $(DESTDIR)$(MAN_DIR)/man5
- 
- install_config: 
--	$(INSTALL) -d -m 755 $(INSTALL_OWNER) $(DESTDIR)$(ETC_DIR)
--	if [ ! -f $(ETC_DIR)/vtund.conf ]; then \
--	  $(INSTALL) -m 600 $(INSTALL_OWNER) vtund.conf $(DESTDIR)$(ETC_DIR); \
--	fi
-+	$(INSTALL) -d -m 755 $(DESTDIR)$(ETC_DIR)
-+	$(INSTALL) -m 600 vtund.conf $(DESTDIR)$(ETC_DIR);
-+	
- 
- install: vtund install_config install_man
--	$(INSTALL) -d -m 755 $(INSTALL_OWNER) $(DESTDIR)$(VAR_DIR)/run
--	$(INSTALL) -d -m 755 $(INSTALL_OWNER) $(DESTDIR)$(STAT_DIR)
--	$(INSTALL) -d -m 755 $(INSTALL_OWNER) $(DESTDIR)$(LOCK_DIR)
--	$(INSTALL) -d -m 755 $(INSTALL_OWNER) $(DESTDIR)$(SBIN_DIR)
--	$(INSTALL) -m 755 $(INSTALL_OWNER) vtund $(DESTDIR)$(SBIN_DIR)
-+	$(INSTALL) -d -m 755 $(DESTDIR)$(VAR_DIR)/run
-+	$(INSTALL) -d -m 755 $(DESTDIR)$(STAT_DIR)
-+	$(INSTALL) -d -m 755 $(DESTDIR)$(LOCK_DIR)
-+	$(INSTALL) -d -m 755 $(DESTDIR)$(SBIN_DIR)
-+	$(INSTALL) -m 755 vtund $(DESTDIR)$(SBIN_DIR)
- 
- # DO NOT DELETE THIS LINE -- make depend depends on it.