Restore patch for 3.26

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0xF52D4BBA

3 files changed, 49 insertions, 15 deletions

diff --git a/net-misc/stunnel/ChangeLog b/net-misc/stunnel/ChangeLog
index a48114821aae..bbdc10a00e7b 100644
--- a/net-misc/stunnel/ChangeLog
+++ b/net-misc/stunnel/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/stunnel
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/stunnel/ChangeLog,v 1.168 2014/06/11 14:31:53 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/stunnel/ChangeLog,v 1.169 2014/06/11 14:41:33 blueness Exp $
+
+  11 Jun 2014; Anthony G. Basile <blueness@gentoo.org>
+  +files/stunnel-3.26-gentoo.diff:
+  Restore patch for 3.26
 
   11 Jun 2014; Anthony G. Basile <blueness@gentoo.org>
   -files/stunnel-3.26-gentoo.diff, -files/stunnel-4.54-listen-queue.patch,
diff --git a/net-misc/stunnel/Manifest b/net-misc/stunnel/Manifest
index 72e574835ee9..d4d00cf83f33 100644
--- a/net-misc/stunnel/Manifest
+++ b/net-misc/stunnel/Manifest
@@ -1,6 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX stunnel-3.26-gentoo.diff 941 SHA256 e2a9fab361699b01ccd004ef598bb868d5f6f37bd40d05b7a16a97cd9ecee2f2 SHA512 73461f59505ee6583e7ba0f7422f1bf3e1cbec6349497ef77bf7987b0c4c8c87bbafdd1c6256c47aa24e3577d5198ce0347f32880f7c0ac48604cfc720137a0f WHIRLPOOL 478ac545efd0c77ef0cc130637788a56b861bf6f203f14319f589086bcbbaebbacd13bac087dafcf8d62cd9ad66ed52a1b608d66b66b66e648c953084c37dbf7
 AUX stunnel-4.44-listen-queue.diff 2205 SHA256 5b94f4b1b2e1daec6a4f28fccf2bbc738581fdb7efcf700d9394af71e5d734fa SHA512 9df8ec5ade5bafea935b73b76d9528146757db4f53b1304188399e3194161b0394d92458c8f5573af69270f08fb9c2c649b6e513bcb98853e8f13f6be1fc04d2 WHIRLPOOL 8356ce215b9f2bb8a9e3359dedcff186d787f44ac46c1699f47662df739cd5235796987961b88569425b29aaff9d030b95601d9f4265574207497546bb94d16c
 AUX stunnel-4.44-xforwarded-for.diff 11232 SHA256 0bdef230b03c2086992bc0e4e8e11bd625695bafc56f222d3a3ed69de34706ee SHA512 77eb690496703740e4b3029121f61a0ebfcfe32c3e2074f833f966dcc5815dcc212d50d36f28fbe8c6fc1afabff18148027e794cf0e70c8d7b920654a10c24af WHIRLPOOL 5ba1f44ccb208ec0b2c08a5c17a9a22cdf52c58a541b69c0f43dd4016f206e185aa49a8041a57119e1eb9107b8dfbebd346e344fe24526c80a6e7a960b8892c9
 AUX stunnel.conf 1423 SHA256 be8deb0e051f594e14c898c2ec8a4a6879adcd48a56286093653346d12c3f105 SHA512 bbdd8d88f7dbadb7de1ebfc85e936e12b70ea5aae27c204e005b998246d834c367742f2d2b85de7e100cf245260f65acd17e1b6cb7a383651401e6304fc05a84 WHIRLPOOL 0766c87ddd2b915d7b46e86b06b6d9c5c1bd00e8c3358a60624d05072cf9deffbda08af991d684db5f3a85208226440ed9060813a50bd9dc1ae6e38d74a9200c
@@ -18,22 +19,22 @@ EBUILD stunnel-3.26.ebuild 728 SHA256 7e48fb3cedb7e87cf1461f1eca9a406b82a56985d7
 EBUILD stunnel-4.44.ebuild 2268 SHA256 dfe33389d4b47bac2396d3e22ec3ad246363d903dd81a3f4fbf8168e0c30583b SHA512 3def0cfc7cc912f7aa939b49d01b042c8da5a743a87fb21bc255faac9c3d070481753086a8d9319fde963cfe006712d0e076a71c7d1edcda2d523024eb263343 WHIRLPOOL 0085927cf2173ba0df4aac94e5d0a898fe3ac8b754b2a9559f991e9cf3de04087f24c09470226d1298e8e27417a47ed47563a2368253c5c5972be531a2a14676
 EBUILD stunnel-4.56-r2.ebuild 2373 SHA256 446ae82e2c32c3e36b7da296d638f7a09e7492b054dece5951f4aa591284b6a3 SHA512 8b6eac4a994e5b9f5f1fba29b4315e3f80ab7f9014c3d25d7b2c48e0927a92baf13e8b48c0c1bbc42d7dee99f7087431637a4344ccdc3ecea91dd18b5e63e5df WHIRLPOOL 5f06354d587b71ea9c889cf040175ff5c10ad47cb031d7de46a8541259a7575db63b356ab977bfc08cd2eea42c8cb9f39f9ee413e9e491f4ce8fbb4c987bbbf9
 EBUILD stunnel-5.02.ebuild 2229 SHA256 812c9f640b6e05a185b5daf0b5fda3670321b92c03a60b25935a272130f61ee7 SHA512 999b19c9d7d23ba59f3648e0d6a6d5bfa44d7a12bbe0d1af698e3c5e47aeace12688f5d2fe4878cb1618637a579525f2cb9144597ad01b7773d6433b73b1ee64 WHIRLPOOL 415dc0dcadbdea0d521e0fec59123bf4ef75d39122907670fdd9d8258c475a79e3aef656ceaeca476fa895d063b977e856df1faa81343f875c89674de350c445
-MISC ChangeLog 24756 SHA256 c92f032f289373edc76f41e38cbc55a95785438ab5112033f3cce4ef466bbfaa SHA512 4c5d1da091bb92b9252e29aa0e39ab97f9d7bdec66d363af6e1af3947ddd8e8734a39957b551ad01312acaa2b0532a2e52cd915d76067fc9ebcb028d4b30d960 WHIRLPOOL 8ec84082dd8fbe929bc661460ecfe2477d99d0bfdd6b0ffc70d537512cc74cd751d92a15967c839d85d1818149a36a1b8ee13ca44934dd127a93e293fbe4624b
+MISC ChangeLog 24872 SHA256 f4842eae338e0d5152fd087e5852c13129fa81848f1eedf8de5503d0fe76fc03 SHA512 497b7f1ab05cf21438563730b8ba3d49b43292149c2ae60f0b2b6c6eb9c165ef015a13d2ac7ea9fee8895ef1a794654a16ea27b1cd94134a1e7d4151f6dd735e WHIRLPOOL bd1a23ccfd00faaf65f6f9811c6e3ff8214551f4ab4ee33a62b35470b905b8eab236b19935c5b333d9f6fccc64c98a475f59dca389b620aff31023a45472c4b9
 MISC metadata.xml 786 SHA256 89e26645a5b0f47e4eeff63f207e868f4f05d313c170c3efeb4ce2af1c73cfb7 SHA512 dcd39ea294b27109f7e9a8d0e8ded9a42e5e27018b25d202af39ff12adf60caa987e326c45912a7bc52ad357dcc87bf618725cd34208888164a8117588466801 WHIRLPOOL 39d384fbfd8b6d618272c844436bc9531aa58a34edcd43807edc7315795ef31b5f26cab4e69adae463ed11c83d8c5953e04935612af22b3002c0e83048ad0e1a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTmGhqAAoJEJOE+m71LUu6iOYP/18zwl8ahr5bdGDyEuuztqKN
-8dpgyRWXt1KsIh269l8QkxfYTzpRVnBmzpxS1yZ1LHibD+jYU9mDmBhhozS11+mn
-fh45D9Qt+lQTZBfo/Dtpkii6nfel97NkDrS8gpgNmeDraR5hNel5eTQPwURF4dsR
-Ji7YwW0KKoIZJwflS4zOSP1/JHisr0QmEFu2F+Lc5DwJPWPuTIpD6aT0WcxTHWhu
-IqeuDUgEK4GjegaXxt1DuzW9u/2NO+7rGEE06lP2n/JV8qzB05h8ts4YTlXYf80L
-ei7p+JB7n9QHzb/fLdv3/+OCQpp/ewgxMvxoZJZthYX4RqOdn+9vVrh1palzntEW
-afRphfdyraAV5S6HjZ6Zwz9TgHTp4dblv43sQbDMS38Nzf4+pRtdqH8VOnzEl6ze
-UlJzlZVZwMmK3ePmL7Ul714bqIpd3Eb0b08fjf3rrGH9NOCPc/hXa4fMPGJhGpp6
-LbFzkGr7m5fet1vIDGql+pd5Q22FCKa/OO72Le1zx7HjReSNGy73N0375nOOX0bW
-qfIBflehUVZK/xU28vn+810kodTY95bGh3lNYuD+KYAGQTmfRbIFxYD0JhBHEVMb
-AxblKrc4In4J8mk0q+I29HSwz9FSEtNZljNEpoVZWXsT5QDTbONeXU+00dsNExAS
-yfR9NY0VuYmL6pXlTdpm
-=lLtR
+iQIcBAEBCAAGBQJTmGqtAAoJEJOE+m71LUu6TqMP/jfc0+u9v20bfXPspDG9XWfO
+KxtypUJ/3+ZshVdrIG1NTzAzjwzsOEAiapB32+O1dhonYBWOiwWqaPJDHve/bbyH
+Jr6iujglu0JEcGpzWXa8haRTS7iHmkGtH3mVSCXYzsjl8FutIMb8D4rEBf+6FuZV
+OsHIn2eMcaIgDbxzE4NvLAioVv3RWicSBnxBwbEDS/nLjJP+V4l5XlIkAMWwsAvt
+nCLppETsaWppe8yDJw4QPXkkIse3tL/6tI6KTnFiExXErO3nMKB70QJKN0JCeNJm
+/PlkU85EQBVX4wvQfzp9NMSPyI55uvcacIkTRZf7yOYoMToitQVmwq6NGQXz1pcY
+RjQuAkBm64ga5JbkcND5PB5zVenZREEegPrRyVMV1CPgF7yP4kX+8ij956xcJOpU
+C47EbF/63EZV4o/jBac9i4aA/zWQl35u0V+DsQ2BkTcK0wvN1vgOLBw2VE1VtxRi
+dbl/toMGhLhVaffC+O0U8SjGBLGCpcMfdZEJlVNT3eYMwDSfFbDE8GwFC30iv7ze
+/Vg/kN6k/JKEeukp5cu4OIbmb4sIh4kAnQ94cSBC43dGREr6iGDJXnujNEyYYfOn
+iJCp8e8Y3fVP4/XWAze04WCrUCH0CzYuEHoKHhzemfpq8VT8gXPI1Q1iFt7Jmo9o
+ncMwwB0jUQUVy1ltuN1C
+=EPdt
 -----END PGP SIGNATURE-----
diff --git a/net-misc/stunnel/files/stunnel-3.26-gentoo.diff b/net-misc/stunnel/files/stunnel-3.26-gentoo.diff
new file mode 100644
index 000000000000..a6d0faa66f80
--- /dev/null
+++ b/net-misc/stunnel/files/stunnel-3.26-gentoo.diff
@@ -0,0 +1,29 @@
+--- Makefile.in	Sun Dec 23 12:03:25 2001
++++ Makefile.in	Thu Jan 17 12:28:22 2002
+@@ -9,7 +9,7 @@
+ sbindir=@sbindir@
+ libdir=@libdir@
+ man8dir=@mandir@/man8
+-piddir=@localstatedir@/stunnel/
++piddir=/var/run
+ ssldir=@ssldir@
+ openssl=$(ssldir)/bin/openssl
+ PEM_DIR=@PEM_DIR@
+@@ -24,7 +24,7 @@
+ LIBS=@LIBS@
+ HEADERS=common.h prototypes.h client.h
+ OBJS=client.o stunnel.o ssl.o protocol.o sthreads.o pty.o log.o options.o
+-DESTFILES=$(sbindir)/stunnel $(libdir)/stunnel.so $(man8dir)/stunnel.8  $(PEM_DIR)/stunnel.pem
++DESTFILES=$(sbindir)/stunnel $(libdir)/stunnel.so $(man8dir)/stunnel.8
+ 
+ WINGCC=i386-mingw32msvc-gcc 
+ WINCFLAGS=-O2 -Wall -DUSE_WIN32=1 -DHAVE_OPENSSL=1 -DFD_SETSIZE=4096 -DVERSION=\"@VERSION@\" -I../openssl-0.9.6b/outinc
+@@ -33,7 +33,7 @@
+ 
+ # standard external rules
+ 
+-all: stunnel stunnel.8 stunnel.html stunnel.so stunnel.pem
++all: stunnel stunnel.8 stunnel.html stunnel.so
+ 
+ install: all installdirs $(DESTFILES)
+