diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2010-07-11 04:25:58 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2010-07-11 04:25:58 +0000 |
| commit | e4b40aa942596121e3154f2d9da652cf42f7c003 (patch) | |
| tree | 9a61eec2e59c620ebfbd7378fb0b54752bf9ff7b /sys-block/partimage | |
| parent | Missing #ifdef in patch, thanks to Michael Sterrett for noticing. (diff) | |
| download | historical-e4b40aa942596121e3154f2d9da652cf42f7c003.tar.gz historical-e4b40aa942596121e3154f2d9da652cf42f7c003.tar.bz2 historical-e4b40aa942596121e3154f2d9da652cf42f7c003.zip | |
Missing #ifdef in patch, thanks to Michael Sterrett for noticing.
Package-Manager: portage-2.2_rc67/cvs/Linux x86_64
Diffstat (limited to 'sys-block/partimage')
| -rw-r--r-- | sys-block/partimage/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-block/partimage/Manifest | 4 | ||||
| -rw-r--r-- | sys-block/partimage/files/partimage-0.6.8-openssl-1.patch | 16 |
3 files changed, 18 insertions, 8 deletions
diff --git a/sys-block/partimage/ChangeLog b/sys-block/partimage/ChangeLog index 716c9caff044..65743a02b5c0 100644 --- a/sys-block/partimage/ChangeLog +++ b/sys-block/partimage/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-block/partimage # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-block/partimage/ChangeLog,v 1.44 2010/07/11 02:53:05 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-block/partimage/ChangeLog,v 1.45 2010/07/11 04:25:58 ssuominen Exp $ + + 11 Jul 2010; Samuli Suominen <ssuominen@gentoo.org> + files/partimage-0.6.8-openssl-1.patch: + Missing #ifdef in patch, thanks to Michael Sterrett for noticing. 11 Jul 2010; Samuli Suominen <ssuominen@gentoo.org> partimage-0.6.8.ebuild, +files/partimage-0.6.8-openssl-1.patch: diff --git a/sys-block/partimage/Manifest b/sys-block/partimage/Manifest index 33343b15f6cd..523c01f3017c 100644 --- a/sys-block/partimage/Manifest +++ b/sys-block/partimage/Manifest @@ -6,7 +6,7 @@ AUX partimage-0.6.7-chown.patch 1888 RMD160 0db2de481cddd206eb47fa8ef4ee37c01c6f AUX partimage-0.6.7-datadir-path.patch 673 RMD160 4ba52dcfc6857026864a5fc460dd978164d0b967 SHA1 03e485c794a9ca24fb85e41d8dba2af8a9cc0abb SHA256 84bbb66c69cbd183bb326e17da2a0b7540690c5f1435903d9e5e7ae4c4cbc820 AUX partimage-0.6.7-gcc43.patch 1299 RMD160 1541906226f8000eb140bd76c553ab3257e80441 SHA1 e717c7ce64f4e3e06a0f03a26e39e2e0ddaee41a SHA256 91dd330641d28f1bcb5a22a57618249a4f4e5350b0837b2636ef48abfa64443f AUX partimage-0.6.8-destdir.patch 562 RMD160 24cf252d35451474a90da88f4dc5354f33979965 SHA1 6825cb3015b3d271110d99686324d83f5333047d SHA256 ba51a0397ae9e220da4a76d2f441c96e1327e9bf6a696f44b6d01baf31e4603a -AUX partimage-0.6.8-openssl-1.patch 464 RMD160 9275319a2b0b6925685d63da6069e8b223b1ea27 SHA1 b87e9ec441278e7d8695edb28b0948da25e81b4b SHA256 b9f21dc7e330a1159d033b26a9e12a46af87202035cc4970acf01f651ae76354 +AUX partimage-0.6.8-openssl-1.patch 593 RMD160 df47fd0d19baf3fccffd654f82667f3ca5f73f3f SHA1 5faeab46525557247f21cb3f629dcd33e58050fb SHA256 179e0876c29bc619d3bec50565122681f36396cc68cce563679e82d04b31671e AUX partimage.1 4492 RMD160 6d35af437de84b7825d089aa7883593bd93124ef SHA1 1b9514e8e8b13a7e4a3dc1b497008e79fc295a48 SHA256 9c6f726dd4e873271765c402d6b1d971532d0c3540fb78a09ed4ddf8d06ba2e6 AUX partimaged.8 1448 RMD160 8cd38ac1b519f805b43fea713f15067c1ae4eec9 SHA1 8d370d024934b416d2ad8ed4c297e78acabe3679 SHA256 f82674fb2956836afacc440b03703fb7a48339abad7d1e8573f208adf8fffa51 AUX partimaged.conf 424 RMD160 e1dbe5dd5a3eec01b3061cce992f1fbee4bec167 SHA1 f571f19bf872f43df9c086162aed96992a073db3 SHA256 f794f539051e0f2e5f3ce357c4683c4a22a9e87b31f1ae113fcf58cd8bda43cf @@ -18,5 +18,5 @@ DIST partimage-0.6.7.tar.bz2 628214 RMD160 e01315fe6073653c89f2dea3c19483853960d DIST partimage-0.6.8.tar.bz2 631193 RMD160 93262d84c69719451ad82b7cbb7e07f8dced61bc SHA1 e88c22e8ba67545dc9d836c12ec56c89c0c11663 SHA256 98f91bf6baa108e390989ce963f75bc30f40ba9c6eb4e953abeedca9a6e6e4b4 EBUILD partimage-0.6.7.ebuild 4619 RMD160 273de0a60a7c421cbb3b6b46409e9265f59ab65c SHA1 b81931dc6ff45f346408b084270b935daeca7a14 SHA256 c3a7c92e63cab0037abd54d69e24dee83a56808789e6e870b7f7bce6fad3079c EBUILD partimage-0.6.8.ebuild 3717 RMD160 f83866f2a0ad7ceb651bc02b746327fb4c9b05c4 SHA1 4ded8a5071d0238ebc3db733b5cc8e3812ee0f8c SHA256 6d76c9914e1d2786d3441d5cdd57304d4912066968657fe706e159db9c3d9695 -MISC ChangeLog 12171 RMD160 6dedbeb1ee7c04460521c8030c4fbb1439ec1f1e SHA1 8d1941fd52208f776b910709e0053bef12860c1b SHA256 70cb976518783fda565e7957f38f0b1dd44031fd9375a65cec687e2b7c8e52c1 +MISC ChangeLog 12335 RMD160 f32ea817ae3df40841dbc1d2b6a7d0d534df078f SHA1 b629b9db69f1a49efe277a0bd64b4d85f60add89 SHA256 2be5ec4eff5be1aa5431fa5eeb91316a167029fe022822560c60ac3eb6201377 MISC metadata.xml 263 RMD160 f6a0896b330530ad4354f3d145b000d57dafb95a SHA1 cd64d6abb8aff2ed3503c5695884453506e3d952 SHA256 1067ab0115fc08e2b71da0707f6cacd6a229d6f1ce5ea3a57c24dc1c171948f5 diff --git a/sys-block/partimage/files/partimage-0.6.8-openssl-1.patch b/sys-block/partimage/files/partimage-0.6.8-openssl-1.patch index a4ebeb9aac60..69268a99ff36 100644 --- a/sys-block/partimage/files/partimage-0.6.8-openssl-1.patch +++ b/sys-block/partimage/files/partimage-0.6.8-openssl-1.patch @@ -2,23 +2,29 @@ http://bugs.gentoo.org/326879 --- src/client/netclient.h +++ src/client/netclient.h -@@ -35,7 +35,7 @@ +@@ -35,7 +35,11 @@ #ifdef HAVE_SSL SSL_CTX * ctx; X509 * server_cert; -- SSL_METHOD * meth; ++ #if OPENSSL_VERSION_NUMBER >= 0x10000000L + const SSL_METHOD * meth; ++ #else + SSL_METHOD * meth; ++ #endif #endif bool m_bUseSSL; bool m_bMustLogin; --- src/server/netserver.h +++ src/server/netserver.h -@@ -41,7 +41,7 @@ +@@ -41,7 +41,11 @@ #ifdef HAVE_SSL SSL_CTX * ctx; X509 * client_cert; -- SSL_METHOD * meth; -+ const SSL_METHOD * meth; ++ #if OPENSSL_VERSION_NUMBER >= 0x10000000L ++ const SSL_METHOD * meth; ++ #else + SSL_METHOD * meth; ++ #endif int err; #endif |