[gentoo-commits] proj/musl:master commit in: sys-block/partimage/files/, sys-block/partimage/
commit: 127bd4daaae3a83dc1a0079cd8a6c16ef2bf0c91
Author: John Helmert III gentoo org>
AuthorDate: Sat Dec 10 02:57:35 2022 +
Commit: John Helmert III gentoo org>
CommitDate: Sat Dec 10 02:57:35 2022 +
URL:https://gitweb.gentoo.org/proj/musl.git/commit/?id=127bd4da
sys-block/partimage: treeclean
Bug: https://bugs.gentoo.org/853883
Closes: https://bugs.gentoo.org/884993
Signed-off-by: John Helmert III gentoo.org>
sys-block/partimage/Manifest | 1 -
.../files/partimage-0.6.9-minor-typo.patch | 13 --
.../files/partimage-0.6.9-missing-includes.patch | 37 --
...partimage-0.6.9-openssl-1.1-compatibility.patch | 41 --
.../files/partimage-0.6.9-zlib-1.2.5.2.patch | 33 -
sys-block/partimage/files/partimaged.conf | 9 --
sys-block/partimage/files/partimaged.init.2| 28
sys-block/partimage/files/partimaged.pam.2 | 7 -
sys-block/partimage/files/servercert.cnf | 36 --
sys-block/partimage/metadata.xml | 14 --
sys-block/partimage/partimage-0.6.9-r1.ebuild | 143 -
11 files changed, 362 deletions(-)
diff --git a/sys-block/partimage/Manifest b/sys-block/partimage/Manifest
deleted file mode 100644
index d01ed555..
--- a/sys-block/partimage/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST partimage-0.6.9.tar.bz2 666522 BLAKE2B
d9a240f82a7b6ae73997df46c964fdddf8dddea9e3bd9548252d9409a526358714908316c52864b60bc9fcc1113a5e1c6cf294faff6845a183c7ffe1012475a6
SHA512
252885921b23933fdcdf0bb6efa4b82066b08ca95cc653296912d384ae875b421c1d39f347a90115315139176d4eab4a930c24919c2d38cf00ed29c764cd14d9
diff --git a/sys-block/partimage/files/partimage-0.6.9-minor-typo.patch
b/sys-block/partimage/files/partimage-0.6.9-minor-typo.patch
deleted file mode 100644
index 8e0e00e0..
--- a/sys-block/partimage/files/partimage-0.6.9-minor-typo.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-https://bugs.gentoo.org/580290
-
a/src/client/misc.h
-+++ b/src/client/misc.h
-@@ -36,7 +36,7 @@ struct COptions;
- #endif
-
- #ifndef makedev
-- #define makedev(maj,min) (((maj) << 8) | min))
-+ #define makedev(maj,min) (((maj) << 8) | (min))
- #endif
-
- // ===
diff --git a/sys-block/partimage/files/partimage-0.6.9-missing-includes.patch
b/sys-block/partimage/files/partimage-0.6.9-missing-includes.patch
deleted file mode 100644
index def27f6e..
--- a/sys-block/partimage/files/partimage-0.6.9-missing-includes.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 0b7b162fbbab1b1d4adf61c5e33f508be0e68895 Mon Sep 17 00:00:00 2001
-From: Jory Pratt
-Date: Sun, 12 Apr 2020 13:25:49 -0500
-Subject: [PATCH] add missing includes
-
- src/client/misc.cpp | 1 +
- src/shared/common.h | 1 +
- 2 files changed, 2 insertions(+)
-
-diff --git a/src/client/misc.cpp b/src/client/misc.cpp
-index a094803..1c96ef6 100644
a/src/client/misc.cpp
-+++ b/src/client/misc.cpp
-@@ -40,6 +40,7 @@
-
- #include
- #include
-+#include
- #include
- #include
- #include
-diff --git a/src/shared/common.h b/src/shared/common.h
-index 71de058..eead7e3 100644
a/src/shared/common.h
-+++ b/src/shared/common.h
-@@ -23,6 +23,7 @@
- #include
-
- #include
-+#include
-
- #include "partimage.h"
-
---
-2.26.0
-
diff --git
a/sys-block/partimage/files/partimage-0.6.9-openssl-1.1-compatibility.patch
b/sys-block/partimage/files/partimage-0.6.9-openssl-1.1-compatibility.patch
deleted file mode 100644
index af4d9c15..
--- a/sys-block/partimage/files/partimage-0.6.9-openssl-1.1-compatibility.patch
+++ /dev/null
@@ -1,41 +0,0 @@
a/configure.ac
-+++ b/configure.ac
-@@ -240,7 +240,7 @@ if test "$SSL" = "yes"; then
- AC_CHECKING([ for SSL Library and Header files ... ])
- AC_SEARCH_HEADERS(rsa.h crypto.h x509.h pem.h ssl.h err.h,
- $SSL_HDR_DIR /usr/include/ssl /usr/include/openssl /usr/include,
--[ AC_CHECK_LIB(crypto, CRYPTO_lock, [LIBS="$LIBS -lcrypto"],
-+[ AC_CHECK_LIB(crypto, X509_new, [LIBS="$LIBS -lcrypto"],
- AC_MSG_ERROR([ Required for SSL Crypto Library not found. ])
- )
-AC_CHECK_LIB(ssl, SSL_CTX_new,
a/src/client/netclient.cpp
-+++ b/src/client/netclient.cpp
-@@ -43,7 +43,11 @@ CNetClient::CNetClient(bool bMustLogin, bool bUseSSL):CNet()
- {
- showDebug(3, "initializing client ssl\n");
- SSLeay_add_ssl_algorithms();
-- meth = SSLv2_client_method();
-+#if OPENSSL_VERSION_NUMBER < 0x1010
-+ meth = TLSv1_client_method();
-+#else
-+ meth = TLS_client_method();
-+#endif
- SSL_load_error_strings();
- ctx = SSL_CTX_new(meth);
- if (!ctx)
a/src/server/netserver.cpp
-+++ b/src/server/netserver.cpp
-@@ -39,7 +39,11 @@ CNetServer::CNetServer(unsigned short int port):CNet()
- {
- SSL_load_error_strings();
- SSLeay_add_ssl_algorithms();
-- meth = SSLv23_server_method();
-+#if OPENSSL_VERSION_NUMBER <
[gentoo-commits] proj/musl:master commit in: sys-block/partimage/
commit: 8e9a00e5d4d6460e85d4f729dabf054fdab9bf85 Author: Sam James gentoo org> AuthorDate: Tue Aug 2 22:08:16 2022 + Commit: Sam James gentoo org> CommitDate: Tue Aug 2 22:08:48 2022 + URL:https://gitweb.gentoo.org/proj/musl.git/commit/?id=8e9a00e5 sys-block/partimage: [QA] fix DTD HTTP->HTTPS Signed-off-by: Sam James gentoo.org> sys-block/partimage/metadata.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-block/partimage/metadata.xml b/sys-block/partimage/metadata.xml index 0862b060..2512c2d0 100644 --- a/sys-block/partimage/metadata.xml +++ b/sys-block/partimage/metadata.xml @@ -1,5 +1,5 @@ -http://www.gentoo.org/dtd/metadata.dtd;> +https://www.gentoo.org/dtd/metadata.dtd;> base-sys...@gentoo.org
[gentoo-commits] proj/musl:master commit in: sys-block/partimage/, sys-block/partimage/files/
commit: 13baed0a13c710252e7e7698d92a9a4da60a62ec
Author: Jory Pratt gentoo org>
AuthorDate: Sun Apr 12 18:37:45 2020 +
Commit: Jory Pratt gentoo org>
CommitDate: Sun Apr 12 18:37:45 2020 +
URL:https://gitweb.gentoo.org/proj/musl.git/commit/?id=13baed0a
sys-block/partimage: add missing includes
Fixes: https://bugs.gentoo.org/715756
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Jory Pratt gentoo.org>
sys-block/partimage/Manifest | 1 +
.../files/partimage-0.6.9-minor-typo.patch | 13 ++
.../files/partimage-0.6.9-missing-includes.patch | 37 ++
...partimage-0.6.9-openssl-1.1-compatibility.patch | 41 ++
.../files/partimage-0.6.9-zlib-1.2.5.2.patch | 33 +
sys-block/partimage/files/partimaged.conf | 9 ++
sys-block/partimage/files/partimaged.init.2| 28
sys-block/partimage/files/partimaged.pam.2 | 7 +
sys-block/partimage/files/servercert.cnf | 36 ++
sys-block/partimage/metadata.xml | 14 ++
sys-block/partimage/partimage-0.6.9-r1.ebuild | 143 +
11 files changed, 362 insertions(+)
diff --git a/sys-block/partimage/Manifest b/sys-block/partimage/Manifest
new file mode 100644
index 000..d01ed55
--- /dev/null
+++ b/sys-block/partimage/Manifest
@@ -0,0 +1 @@
+DIST partimage-0.6.9.tar.bz2 666522 BLAKE2B
d9a240f82a7b6ae73997df46c964fdddf8dddea9e3bd9548252d9409a526358714908316c52864b60bc9fcc1113a5e1c6cf294faff6845a183c7ffe1012475a6
SHA512
252885921b23933fdcdf0bb6efa4b82066b08ca95cc653296912d384ae875b421c1d39f347a90115315139176d4eab4a930c24919c2d38cf00ed29c764cd14d9
diff --git a/sys-block/partimage/files/partimage-0.6.9-minor-typo.patch
b/sys-block/partimage/files/partimage-0.6.9-minor-typo.patch
new file mode 100644
index 000..8e0e00e
--- /dev/null
+++ b/sys-block/partimage/files/partimage-0.6.9-minor-typo.patch
@@ -0,0 +1,13 @@
+https://bugs.gentoo.org/580290
+
+--- a/src/client/misc.h
b/src/client/misc.h
+@@ -36,7 +36,7 @@ struct COptions;
+ #endif
+
+ #ifndef makedev
+- #define makedev(maj,min) (((maj) << 8) | min))
++ #define makedev(maj,min) (((maj) << 8) | (min))
+ #endif
+
+ // ===
diff --git a/sys-block/partimage/files/partimage-0.6.9-missing-includes.patch
b/sys-block/partimage/files/partimage-0.6.9-missing-includes.patch
new file mode 100644
index 000..def27f6
--- /dev/null
+++ b/sys-block/partimage/files/partimage-0.6.9-missing-includes.patch
@@ -0,0 +1,37 @@
+From 0b7b162fbbab1b1d4adf61c5e33f508be0e68895 Mon Sep 17 00:00:00 2001
+From: Jory Pratt
+Date: Sun, 12 Apr 2020 13:25:49 -0500
+Subject: [PATCH] add missing includes
+
+---
+ src/client/misc.cpp | 1 +
+ src/shared/common.h | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/src/client/misc.cpp b/src/client/misc.cpp
+index a094803..1c96ef6 100644
+--- a/src/client/misc.cpp
b/src/client/misc.cpp
+@@ -40,6 +40,7 @@
+
+ #include
+ #include
++#include
+ #include
+ #include
+ #include
+diff --git a/src/shared/common.h b/src/shared/common.h
+index 71de058..eead7e3 100644
+--- a/src/shared/common.h
b/src/shared/common.h
+@@ -23,6 +23,7 @@
+ #include
+
+ #include
++#include
+
+ #include "partimage.h"
+
+--
+2.26.0
+
diff --git
a/sys-block/partimage/files/partimage-0.6.9-openssl-1.1-compatibility.patch
b/sys-block/partimage/files/partimage-0.6.9-openssl-1.1-compatibility.patch
new file mode 100644
index 000..af4d9c1
--- /dev/null
+++ b/sys-block/partimage/files/partimage-0.6.9-openssl-1.1-compatibility.patch
@@ -0,0 +1,41 @@
+--- a/configure.ac
b/configure.ac
+@@ -240,7 +240,7 @@ if test "$SSL" = "yes"; then
+ AC_CHECKING([ for SSL Library and Header files ... ])
+ AC_SEARCH_HEADERS(rsa.h crypto.h x509.h pem.h ssl.h err.h,
+ $SSL_HDR_DIR /usr/include/ssl /usr/include/openssl /usr/include,
+-[ AC_CHECK_LIB(crypto, CRYPTO_lock, [LIBS="$LIBS -lcrypto"],
++[ AC_CHECK_LIB(crypto, X509_new, [LIBS="$LIBS -lcrypto"],
+ AC_MSG_ERROR([ Required for SSL Crypto Library not found. ])
+ )
+AC_CHECK_LIB(ssl, SSL_CTX_new,
+--- a/src/client/netclient.cpp
b/src/client/netclient.cpp
+@@ -43,7 +43,11 @@ CNetClient::CNetClient(bool bMustLogin, bool bUseSSL):CNet()
+ {
+ showDebug(3, "initializing client ssl\n");
+ SSLeay_add_ssl_algorithms();
+- meth = SSLv2_client_method();
++#if OPENSSL_VERSION_NUMBER < 0x1010
++ meth = TLSv1_client_method();
++#else
++ meth = TLS_client_method();
++#endif
+ SSL_load_error_strings();
+ ctx = SSL_CTX_new(meth);
+ if (!ctx)
+--- a/src/server/netserver.cpp
b/src/server/netserver.cpp
+@@ -39,7 +39,11 @@ CNetServer::CNetServer(unsigned short int port):CNet()
+ {
+ SSL_load_error_strings();
+ SSLeay_add_ssl_algorithms();
+- meth = SSLv23_server_method();
++#if OPENSSL_VERSION_NUMBER < 0x1010
++
