Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 404269 - =net-misc/openvpn-2.1.4 openvpn-2.1_rc20-pkcs11.patch no longer cleanly applies
Summary: =net-misc/openvpn-2.1.4 openvpn-2.1_rc20-pkcs11.patch no longer cleanly applies
Status: RESOLVED FIXED
Alias: None
Product: Gentoo Linux
Classification: Unclassified
Component: Current packages (show other bugs)
Hardware: All Linux
: Normal normal with 2 votes (vote)
Assignee: Dirkjan Ochtman (RETIRED)
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2012-02-17 15:43 UTC by Ben Kohler
Modified: 2012-02-23 23:00 UTC (History)
5 users (show)

See Also:
Package list:
Runtime testing required: ---


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description Ben Kohler gentoo-dev 2012-02-17 15:43:57 UTC
I believe this change
http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/net-misc/openvpn/files/openvpn-2.1_rc20-pkcs11.patch?r1=1.1&r2=1.2
has made openvpn-2.1_rc20-pkcs11.patch no longer cleanly apply to the current stable openvpn-2.1.4.  Patch now looks for openssl-1.0.0.cnf (instead of openssl.cnf) and this older openvpn still supplies openssl.0.9.6.cnf

Reproducible: Always

Steps to Reproduce:
1. emerge --sync
2. emerge =openvpn-2.1.4
Actual Results:  
...

 * openvpn-2.1.4.tar.gz RMD160 SHA1 SHA256 size ;-) ...                  [ ok ]
>>> Unpacking source...
>>> Unpacking openvpn-2.1.4.tar.gz to /var/tmp/portage/net-misc/openvpn-2.1.4/work
>>> Source unpacked in /var/tmp/portage/net-misc/openvpn-2.1.4/work
>>> Preparing source in /var/tmp/portage/net-misc/openvpn-2.1.4/work/openvpn-2.1.4 ...
 * Applying openvpn-2.1_rc13-peercred.patch ...                          [ ok ]
 * Applying openvpn-2.1_rc20-pkcs11.patch ...

 * Failed Patch: openvpn-2.1_rc20-pkcs11.patch !
 *  ( /usr/portage/net-misc/openvpn/files/openvpn-2.1_rc20-pkcs11.patch )
...


What changed in the patchfile:

--- openvpn-2.1_rc20-pkcs11.patch	2009/10/10 23:30:15	1.1
+++ openvpn-2.1_rc20-pkcs11.patch	2012/02/16 10:50:02	1.2
@@ -1,6 +1,6 @@
 diff -ru openvpn-2.1_rc20~/easy-rsa/2.0/openssl.cnf openvpn-2.1_rc20/easy-rsa/2.0/openssl.cnf
---- openvpn-2.1_rc20~/easy-rsa/2.0/openssl.cnf	2009-10-11 01:04:36.000000000 +0200
-+++ openvpn-2.1_rc20/easy-rsa/2.0/openssl.cnf	2009-10-11 01:05:53.000000000 +0200
+--- openvpn-2.1_rc20~/easy-rsa/2.0/openssl-1.0.0.cnf	2009-10-11 01:04:36.000000000 +0200
++++ openvpn-2.1_rc20/easy-rsa/2.0/openssl-1.0.0.cnf	2009-10-11 01:05:53.000000000 +0200
 @@ -283,9 +283,9 @@
  #pkcs11 = pkcs11_section
Comment 1 Jeroen Roovers (RETIRED) gentoo-dev 2012-02-17 15:49:19 UTC
cvs/gentoo-x86/net-misc/openvpn $ ebuild openvpn-2.1.4.ebuild clean prepare
Appending /newaches/gentoo/cvs/gentoo-x86 to PORTDIR_OVERLAY...
>>> Downloading 'http://swupdate.openvpn.net/community/releases/openvpn-2.1.4.tar.gz'
--2012-02-17 16:48:45--  http://swupdate.openvpn.net/community/releases/openvpn-2.1.4.tar.gz
Resolving swupdate.openvpn.net (swupdate.openvpn.net)... 173.245.60.104, 173.245.61.35
Connecting to swupdate.openvpn.net (swupdate.openvpn.net)|173.245.60.104|:80... connected.
HTTP request sent, awaiting response... 200 OK
Length: 863726 (843K) [application/octet-stream]
Saving to: `/world/distfiles/openvpn-2.1.4.tar.gz'

100%[==========================================================================================>] 863,726      527K/s   in 1.6s

2012-02-17 16:48:46 (527 KB/s) - `/world/distfiles/openvpn-2.1.4.tar.gz' saved [863726/863726]

 * openvpn-2.1.4.tar.gz RMD160 SHA1 SHA256 size ;-) ...                                                                      [ ok ]
>>> Downloading 'http://cloud.github.com/downloads/jjo/openvpn-ipv6/openvpn-2.1.1-ipv6-0.4.11.patch.gz'
--2012-02-17 16:48:46--  http://cloud.github.com/downloads/jjo/openvpn-ipv6/openvpn-2.1.1-ipv6-0.4.11.patch.gz
Resolving cloud.github.com (cloud.github.com)... 205.251.209.193, 205.251.209.196, 205.251.209.226, ...
Connecting to cloud.github.com (cloud.github.com)|205.251.209.193|:80... connected.
HTTP request sent, awaiting response... 200 OK
Length: 20869 (20K) [.gz]
Saving to: `/world/distfiles/openvpn-2.1.1-ipv6-0.4.11.patch.gz'

100%[==========================================================================================>] 20,869      --.-K/s   in 0.03s

2012-02-17 16:48:47 (679 KB/s) - `/world/distfiles/openvpn-2.1.1-ipv6-0.4.11.patch.gz' saved [20869/20869]

 * openvpn-2.1.1-ipv6-0.4.11.patch.gz RMD160 SHA1 SHA256 size ;-) ...                                                        [ ok ]
 * checking ebuild checksums ;-) ...                                                                                         [ ok ]
 * checking auxfile checksums ;-) ...                                                                                        [ ok ]
 * checking miscfile checksums ;-) ...                                                                                       [ ok ]
>>> Unpacking source...
>>> Unpacking openvpn-2.1.4.tar.gz to /home/jer/portage/net-misc/openvpn-2.1.4/work
>>> Unpacking openvpn-2.1.1-ipv6-0.4.11.patch.gz to /home/jer/portage/net-misc/openvpn-2.1.4/work
>>> Source unpacked in /home/jer/portage/net-misc/openvpn-2.1.4/work
>>> Preparing source in /home/jer/portage/net-misc/openvpn-2.1.4/work/openvpn-2.1.4 ...
 * Applying openvpn-2.1_rc13-peercred.patch ...                                                                              [ ok ]
 * Applying openvpn-2.1_rc20-pkcs11.patch ...
 
 * Failed Patch: openvpn-2.1_rc20-pkcs11.patch !
 *  ( /newaches/gentoo/cvs/gentoo-x86/net-misc/openvpn/files/openvpn-2.1_rc20-pkcs11.patch )
 *
 * Include in your bugreport the contents of:
 *
 *   /home/jer/portage/net-misc/openvpn-2.1.4/temp/openvpn-2.1_rc20-pkcs11.patch.out
 
 * ERROR: net-misc/openvpn-2.1.4 failed (prepare phase):
 *   Failed Patch: openvpn-2.1_rc20-pkcs11.patch!
 *
 * Call stack:
 *     ebuild.sh, line   85:  Called src_prepare
 *   environment, line 3132:  Called epatch '/newaches/gentoo/cvs/gentoo-x86/net-misc/openvpn/files/openvpn-2.1_rc20-pkcs11.patch'
 *   environment, line 1802:  Called die
 * The specific snippet of code:
 *               die "Failed Patch: ${patchname}!";
 *
 * If you need support, post the output of 'emerge --info =net-misc/openvpn-2.1.4',
 * the complete build log and the output of 'emerge -pqv =net-misc/openvpn-2.1.4'.
 * The complete build log is located at '/keeps/gentoo/emergelogs/wieneke/net-misc:openvpn-2.1.4:20120217-154845.log'.
 * The ebuild environment file is located at '/home/jer/portage/net-misc/openvpn-2.1.4/temp/environment'.
Comment 2 Alexandr Knish 2012-02-21 11:03:23 UTC
Yes, it all started with 2.16.2012. After emerge -- sync.
It changed the ebuild for 2.1.4

Emerging (2 of 2) net-misc/openvpn-2.1.4
 * openvpn-2.1.4.tar.gz RMD160 SHA1 SHA256 size ;-) ...                                                                                                                                       [ ok ]
>>> Unpacking source...
>>> Unpacking openvpn-2.1.4.tar.gz to /var/tmp/portage/net-misc/openvpn-2.1.4/work
>>> Source unpacked in /var/tmp/portage/net-misc/openvpn-2.1.4/work
>>> Preparing source in /var/tmp/portage/net-misc/openvpn-2.1.4/work/openvpn-2.1.4 ...
 * Applying openvpn-2.1_rc13-peercred.patch ...                                                                                                                                               [ ok ]
 * Applying openvpn-2.1_rc20-pkcs11.patch ...

 * Failed Patch: openvpn-2.1_rc20-pkcs11.patch !
 *  ( /usr/portage/net-misc/openvpn/files/openvpn-2.1_rc20-pkcs11.patch )
 *
 * Include in your bugreport the contents of:
 *
 *   /var/tmp/portage/net-misc/openvpn-2.1.4/temp/openvpn-2.1_rc20-pkcs11.patch.out

 * ERROR: net-misc/openvpn-2.1.4 failed (prepare phase):
 *   Failed Patch: openvpn-2.1_rc20-pkcs11.patch!
 *
 * Call stack:
 *     ebuild.sh, line   85:  Called src_prepare
 *   environment, line 3078:  Called epatch '/usr/portage/net-misc/openvpn/files/openvpn-2.1_rc20-pkcs11.patch'
 *   environment, line 1748:  Called die
 * The specific snippet of code:
 *               die "Failed Patch: ${patchname}!";
 *
 * If you need support, post the output of 'emerge --info =net-misc/openvpn-2.1.4',
 * the complete build log and the output of 'emerge -pqv =net-misc/openvpn-2.1.4'.
 * The complete build log is located at '/var/tmp/portage/net-misc/openvpn-2.1.4/temp/build.log'.
 * The ebuild environment file is located at '/var/tmp/portage/net-misc/openvpn-2.1.4/temp/environment'.
 * S: '/var/tmp/portage/net-misc/openvpn-2.1.4/work/openvpn-2.1.4'

>>> Failed to emerge net-misc/openvpn-2.1.4, Log file:

>>>  '/var/tmp/portage/net-misc/openvpn-2.1.4/temp/build.log'

 * Messages for package net-misc/openvpn-2.1.4:

 * Failed Patch: openvpn-2.1_rc20-pkcs11.patch !
 *  ( /usr/portage/net-misc/openvpn/files/openvpn-2.1_rc20-pkcs11.patch )
 *
 * Include in your bugreport the contents of:
 *
 *   /var/tmp/portage/net-misc/openvpn-2.1.4/temp/openvpn-2.1_rc20-pkcs11.patch.out
 * ERROR: net-misc/openvpn-2.1.4 failed (prepare phase):
 *   Failed Patch: openvpn-2.1_rc20-pkcs11.patch!
 *
 * Call stack:
 *     ebuild.sh, line   85:  Called src_prepare
 *   environment, line 3078:  Called epatch '/usr/portage/net-misc/openvpn/files/openvpn-2.1_rc20-pkcs11.patch'
 *   environment, line 1748:  Called die
 * The specific snippet of code:
 *               die "Failed Patch: ${patchname}!";
 *
 * If you need support, post the output of 'emerge --info =net-misc/openvpn-2.1.4',
 * the complete build log and the output of 'emerge -pqv =net-misc/openvpn-2.1.4'.
 * The complete build log is located at '/var/tmp/portage/net-misc/openvpn-2.1.4/temp/build.log'.
 * The ebuild environment file is located at '/var/tmp/portage/net-misc/openvpn-2.1.4/temp/environment'.
 * S: '/var/tmp/portage/net-misc/openvpn-2.1.4/work/openvpn-2.1.4'

 * GNU info directory index is up-to-date.
Comment 3 Christian Faulhammer (RETIRED) gentoo-dev 2012-02-23 23:00:15 UTC
Should be fixed now for all versions.