* [gentoo-commits] repo/gentoo:master commit in: sys-block/partimage/, sys-block/partimage/files/
@ 2016-04-19 22:39 Mike Frysinger
0 siblings, 0 replies; 5+ messages in thread
From: Mike Frysinger @ 2016-04-19 22:39 UTC (permalink / raw
To: gentoo-commits
commit: f503f77079c568cd9628571cf69b418a51967e49
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 19 22:38:51 2016 +0000
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Tue Apr 19 22:39:22 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f503f770
sys-block/partimage: fix build w/newer glibc #580290
sys-block/partimage/files/partimage-0.6.9-minor-typo.patch | 13 +++++++++++++
sys-block/partimage/partimage-0.6.9.ebuild | 1 +
2 files changed, 14 insertions(+)
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 0000000..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/partimage-0.6.9.ebuild b/sys-block/partimage/partimage-0.6.9.ebuild
index 56ba109..10f9545 100644
--- a/sys-block/partimage/partimage-0.6.9.ebuild
+++ b/sys-block/partimage/partimage-0.6.9.ebuild
@@ -33,6 +33,7 @@ pkg_setup() {
src_prepare() {
epatch "${FILESDIR}"/${P}-zlib-1.2.5.2.patch #405323
+ epatch "${FILESDIR}"/${P}-minor-typo.patch #580290
}
src_configure() {
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-block/partimage/, sys-block/partimage/files/
@ 2019-01-04 20:54 Thomas Deutschmann
0 siblings, 0 replies; 5+ messages in thread
From: Thomas Deutschmann @ 2019-01-04 20:54 UTC (permalink / raw
To: gentoo-commits
commit: 3fe8e9910002b6523d995512a646b063565d0447
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 4 20:51:46 2019 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Fri Jan 4 20:54:06 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3fe8e991
sys-block/partimage: add OpenSSL 1.1+ compatibility
- EAPI bumped to EAPI=6
- OpenSSL 1.1+ compatibility added
Closes: https://bugs.gentoo.org/674074
Package-Manager: Portage-2.3.53, Repoman-2.3.12
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
...partimage-0.6.9-openssl-1.1-compatibility.patch | 41 ++++++
sys-block/partimage/partimage-0.6.9-r1.ebuild | 144 +++++++++++++++++++++
2 files changed, 185 insertions(+)
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 00000000000..af4d9c153df
--- /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 < 0x10100000
++ 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 < 0x10100000
++ meth = TLSv1_server_method();
++#else
++ meth = TLS_server_method();
++#endif
+ ctx = SSL_CTX_new(meth);
+ if (!ctx)
+ {
diff --git a/sys-block/partimage/partimage-0.6.9-r1.ebuild b/sys-block/partimage/partimage-0.6.9-r1.ebuild
new file mode 100644
index 00000000000..5828263d381
--- /dev/null
+++ b/sys-block/partimage/partimage-0.6.9-r1.ebuild
@@ -0,0 +1,144 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools flag-o-matic pam user
+
+DESCRIPTION="Console-based application to efficiently save raw partition data to image file"
+HOMEPAGE="http://www.partimage.org/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="nls nologin pam ssl static"
+
+LIBS_DEPEND="app-arch/bzip2
+ >=dev-libs/newt-0.52
+ >=sys-libs/slang-2
+ sys-libs/zlib:=
+ ssl? ( dev-libs/openssl:0= )"
+PAM_DEPEND="!static? ( pam? ( virtual/pam ) )"
+RDEPEND="${PAM_DEPEND}
+ !static? ( ${LIBS_DEPEND} )"
+DEPEND="${PAM_DEPEND}
+ ${LIBS_DEPEND}
+ nls? ( sys-devel/gettext )"
+
+pkg_setup() {
+ enewgroup partimag 91
+ enewuser partimag 91 -1 /var/lib/partimage partimag
+}
+
+src_prepare() {
+ eapply -p0 "${FILESDIR}"/${P}-zlib-1.2.5.2.patch #405323
+ eapply "${FILESDIR}"/${P}-minor-typo.patch #580290
+ eapply "${FILESDIR}"/${P}-openssl-1.1-compatibility.patch
+
+ eapply_user
+
+ eautoreconf
+}
+
+src_configure() {
+ # XXX: Do we still need these?
+ filter-flags -fno-exceptions
+ use ppc && append-flags -fsigned-char
+
+ local myconf
+
+ use nologin && myconf="${myconf} --disable-login"
+
+ if use pam && ! use static; then
+ myconf="${myconf} --enable-pam"
+ fi
+
+ econf \
+ --docdir="${EPREFIX%/}"/usr/share/doc/${PF} \
+ --sysconfdir="${EPREFIX%/}"/etc \
+ $(use_enable nls) \
+ $(use_enable ssl) \
+ --disable-pam \
+ $(use_enable static all-static) \
+ --with-log-dir="${EPREFIX%/}"/var/log/partimage \
+ ${myconf}
+}
+
+src_install() {
+ default
+
+ keepdir /var/lib/partimage
+ keepdir /var/log/partimage
+
+ newinitd "${FILESDIR}"/partimaged.init.2 partimaged
+ newconfd "${FILESDIR}"/partimaged.conf partimaged
+
+ if use ssl; then
+ insinto /etc/partimaged
+ doins "${FILESDIR}"/servercert.cnf
+ fi
+
+ if use pam; then
+ newpamd "${FILESDIR}"/partimaged.pam.2 partimaged
+ fi
+}
+
+confdir=${EROOT%/}/etc/partimaged
+privkey=${confdir}/partimaged.key
+cnf=${confdir}/servercert.cnf
+csr=${confdir}/partimaged.csr
+cert=${confdir}/partimaged.cert
+
+pkg_config() {
+ if use ssl; then
+ ewarn "Please customize /etc/partimaged/servercert.cnf before you continue!"
+ ewarn "Press Ctrl-C to break now for it, or press enter to continue."
+ read
+ if [ ! -f ${privkey} ]; then
+ einfo "Generating unencrypted private key: ${privkey}"
+ openssl genrsa -out ${privkey} 1024 || die
+ else
+ einfo "Private key already exists: ${privkey}"
+ fi
+ if [ ! -f ${csr} ]; then
+ einfo "Generating certificate request: ${csr}"
+ openssl req -new -x509 -outform PEM -out ${csr} -key ${privkey} -config ${cnf} || die
+ else
+ einfo "Certificate request already exists: ${csr}"
+ fi
+ if [ ! -f ${cert} ]; then
+ einfo "Generating self-signed certificate: ${cert}"
+ openssl x509 -in ${csr} -out ${cert} -signkey ${privkey} || die
+ else
+ einfo "Self-signed certifcate already exists: ${cert}"
+ fi
+ einfo "Setting permissions"
+ partimagesslperms || die
+ einfo "Done"
+ else
+ einfo "SSL is disabled, not building certificates"
+ fi
+}
+
+partimagesslperms() {
+ local ret=0
+ chmod 600 ${privkey} 2>/dev/null
+ ret=$((${ret}+$?))
+ chown partimag:0 ${privkey} 2>/dev/null
+ ret=$((${ret}+$?))
+ chmod 644 ${cert} ${csr} 2>/dev/null
+ ret=$((${ret}+$?))
+ chown root:0 ${cert} ${csr} 2>/dev/null
+ ret=$((${ret}+$?))
+ return $ret
+}
+
+pkg_postinst() {
+ if use ssl; then
+ einfo "To create the required SSL certificates, please do:"
+ einfo "emerge --config =${PF}"
+ partimagesslperms
+ return 0
+ fi
+ chown partimag:0 "${EROOT%/}"/etc/partimaged/partimagedusers || die
+}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-block/partimage/, sys-block/partimage/files/
@ 2021-12-29 7:21 Sam James
0 siblings, 0 replies; 5+ messages in thread
From: Sam James @ 2021-12-29 7:21 UTC (permalink / raw
To: gentoo-commits
commit: 8e680a4ed8101da64e79f204241f5b894e625218
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 29 07:20:58 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Dec 29 07:20:58 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e680a4e
sys-block/partimage: fix build on musl
Closes: https://bugs.gentoo.org/715756
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../files/partimage-0.6.9-missing-includes.patch | 34 ++++++++++++++++++++++
sys-block/partimage/partimage-0.6.9-r2.ebuild | 1 +
2 files changed, 35 insertions(+)
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 000000000000..956afe8319a6
--- /dev/null
+++ b/sys-block/partimage/files/partimage-0.6.9-missing-includes.patch
@@ -0,0 +1,34 @@
+From 0b7b162fbbab1b1d4adf61c5e33f508be0e68895 Mon Sep 17 00:00:00 2001
+From: Jory Pratt <anarchy@gentoo.org>
+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 <ctype.h>
+ #include <sys/types.h>
++#include <sys/sysmacros.h>
+ #include <sys/ioctl.h>
+ #include <sys/mount.h>
+ #include <sys/time.h>
+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 <pthread.h>
+
+ #include <sys/param.h>
++#include <sys/types.h>
+
+ #include "partimage.h"
+
diff --git a/sys-block/partimage/partimage-0.6.9-r2.ebuild b/sys-block/partimage/partimage-0.6.9-r2.ebuild
index e747631d8dc5..34732ed47292 100644
--- a/sys-block/partimage/partimage-0.6.9-r2.ebuild
+++ b/sys-block/partimage/partimage-0.6.9-r2.ebuild
@@ -35,6 +35,7 @@ src_prepare() {
eapply -p0 "${FILESDIR}"/${P}-zlib-1.2.5.2.patch #405323
eapply "${FILESDIR}"/${P}-minor-typo.patch #580290
eapply "${FILESDIR}"/${P}-openssl-1.1-compatibility.patch
+ eapply "${FILESDIR}"/${P}-missing-includes.patch
eapply_user
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-block/partimage/, sys-block/partimage/files/
@ 2022-04-02 18:36 Conrad Kostecki
0 siblings, 0 replies; 5+ messages in thread
From: Conrad Kostecki @ 2022-04-02 18:36 UTC (permalink / raw
To: gentoo-commits
commit: 39f5d9ced3065c61e00feab102aee122055e5b21
Author: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 27 19:03:49 2022 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sat Apr 2 18:34:41 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=39f5d9ce
sys-block/partimage: update EAPI 6 -> 8
Also migrating to GLEP-81,
fixing compilation with clang
and correcting license.
Closes: https://github.com/gentoo/gentoo/pull/24780
Closes: https://bugs.gentoo.org/732102
Closes: https://bugs.gentoo.org/781494
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
.../partimage/files/partimage-0.6.9-clang.patch | 181 +++++++++++++++++++++
.../files/partimage-0.6.9-zlib-1.2.5.2-r1.patch | 33 ++++
sys-block/partimage/partimage-0.6.9-r3.ebuild | 141 ++++++++++++++++
3 files changed, 355 insertions(+)
diff --git a/sys-block/partimage/files/partimage-0.6.9-clang.patch b/sys-block/partimage/files/partimage-0.6.9-clang.patch
new file mode 100644
index 000000000000..b6df8868d16e
--- /dev/null
+++ b/sys-block/partimage/files/partimage-0.6.9-clang.patch
@@ -0,0 +1,181 @@
+--- a/src/client/gui_text.cpp
++++ b/src/client/gui_text.cpp
+@@ -341,7 +341,7 @@
+ m_labelSplit = newtLabel(1, 12, i18n("Image split mode"));
+ m_radioSplitAuto = newtRadiobutton(1, 13, i18n("Automatic split (when no space left)"), !options.qwSplitSize, NULL);
+ m_radioSplitSize = newtRadiobutton(1, 14, i18n("Into files whose size is:............"), !!options.qwSplitSize, m_radioSplitAuto);
+- SNPRINTF(szTemp, "%"PRIu64"", (!!options.qwSplitSize) ? (options.qwSplitSize/1024/1024) : 2048);
++ SNPRINTF(szTemp, "%" PRIu64 "", (!!options.qwSplitSize) ? (options.qwSplitSize/1024/1024) : 2048);
+ m_editSplitSize = newtEntry(43, 14, szTemp, 8, NULL, 0);
+ m_labelSplitSizeKB = newtLabel(52, 14, i18n("MiB"));
+ m_checkSplitWait = newtCheckbox(1, 15, i18n("Wait after each volume change"), (!!options.bSplitWait ? 'X' : ' '), " X", NULL);
+@@ -462,7 +462,7 @@
+ SNPRINTF(szTemp, i18n("Partition to save:...........%s"), szDevice);
+ m_labelPartition = newtLabel(1, 0, szTemp);
+
+- SNPRINTF(szTemp, i18n("Size of the Partition:.......%s = %"PRIu64" bytes"), formatSize(qwPartSize, szTemp2), qwPartSize);
++ SNPRINTF(szTemp, i18n("Size of the Partition:.......%s = %" PRIu64 " bytes"), formatSize(qwPartSize, szTemp2), qwPartSize);
+ m_labelPartitionSize = newtLabel(1, 1, szTemp);
+
+ SNPRINTF(szTemp, i18n("Image file to create:........%s"), szImageFile);
+@@ -610,7 +610,7 @@
+ newtLabelSetText(m_labelImageFileSize, szTemp);
+ }
+
+- SNPRINTF (szTemp, i18n("Available space for image:...%s = %"PRIu64" bytes"), formatSize(qwFreeSpace, szTemp2), qwFreeSpace);
++ SNPRINTF (szTemp, i18n("Available space for image:...%s = %" PRIu64 " bytes"), formatSize(qwFreeSpace, szTemp2), qwFreeSpace);
+ newtLabelSetText(m_labelFreeSpace, szTemp);
+
+ //option -B gui=no
+@@ -734,7 +734,7 @@
+ SNPRINTF(szTemp, i18n("Partition to restore:.............%s"), szDevice);
+ m_labelPartition = newtLabel(1, 0, szTemp);
+
+- SNPRINTF(szTemp, i18n("Size of partition to restore:.....%s = %"PRIu64" bytes"), formatSize(qwCurPartSize, szTemp2), qwCurPartSize);
++ SNPRINTF(szTemp, i18n("Size of partition to restore:.....%s = %" PRIu64 " bytes"), formatSize(qwCurPartSize, szTemp2), qwCurPartSize);
+ m_labelPartitionSize = newtLabel(1, 1, szTemp);
+
+ SNPRINTF(szTemp, i18n("Image file to use:................%s"), szImageFile);
+@@ -751,7 +751,7 @@
+ SNPRINTF(szTemp, i18n("Image created on:.................%s\n"), asctime_portable(&dateCreate));
+ m_labelDate = newtLabel(1, 6, szTemp);
+
+- SNPRINTF(szTemp, i18n("Size of the original partition:...%s = %"PRIu64" bytes"), formatSize(qwOrigPartSize, szTemp2), qwOrigPartSize);
++ SNPRINTF(szTemp, i18n("Size of the original partition:...%s = %" PRIu64 " bytes"), formatSize(qwOrigPartSize, szTemp2), qwOrigPartSize);
+ m_labelOriginalPartitionSize = newtLabel(1, 7, szTemp);
+
+ // stats
+--- a/src/client/imginfo.cpp
++++ b/src/client/imginfo.cpp
+@@ -111,7 +111,7 @@
+ {
+ snprintf(szText, nMaxTextLen, i18n("-------------------- MBR %.3d -------------------\n"
+ "Device:................%s\n"
+- "Device blocks count:...%"PRIu64"\n"
++ "Device blocks count:...%" PRIu64 "\n"
+ "Device model:..........%s\n\n"),
+ i, mbr->szDevice, mbr->qwBlocksCount, mbr->szDescModel);
+ }
+@@ -153,7 +153,7 @@
+ snprintf(szText, nMaxTextLen, i18n("Volume number:.........%u\n"
+ "Volume size:...........%s\n"
+ "Compression level: ....%d -> %s\n"
+- "Identificator:.........%"PRIu64"=%"PRIX64"\n\n"),
++ "Identificator:.........%" PRIu64 "=%" PRIX64 "\n\n"),
+ head->dwVolumeNumber, formatSize(qwImageSize, cTemp), dwCompression,
+ szCompression, head->qwIdentificator, head->qwIdentificator);
+ }
+--- a/src/client/main.cpp
++++ b/src/client/main.cpp
+@@ -301,7 +301,7 @@
+ case 'V': // split image into multiple files
+
+ options.qwSplitSize = (QWORD)atol(optarg) * 1024 * 1024;
+- fprintf (stderr, i18n("Volume size: %"PRIu64" bytes (%ld MiB)\n"),
++ fprintf (stderr, i18n("Volume size: %" PRIu64 " bytes (%ld MiB)\n"),
+ options.qwSplitSize, atol(optarg));
+ break;
+
+--- a/src/client/misc.cpp
++++ b/src/client/misc.cpp
+@@ -211,7 +211,7 @@
+ image.closeReading(true);
+ throw excep;
+ }
+- SNPRINTF(szTemp, "%.3u: %s [%"PRIu64" blocks]", i, mbrOriginal[i].szDevice, mbrOriginal[i].qwBlocksCount);
++ SNPRINTF(szTemp, "%.3u: %s [%" PRIu64 " blocks]", i, mbrOriginal[i].szDevice, mbrOriginal[i].qwBlocksCount);
+ if (options->bBatchMode == false)
+ optGui.addMbr(szTemp, i);
+
+--- a/src/client/fs/fs_base.cpp
++++ b/src/client/fs/fs_base.cpp
+@@ -730,10 +730,10 @@
+
+ if (bShowBlocksInfo)
+ {
+- SNPRINTF(szBlocksInfo, i18n("Block size:...................%"PRIu64" bytes\n"
+- "Total blocks count:...........%"PRIu64"\n"
+- "Used blocks count:............%"PRIu64"\n"
+- "Free blocks count:............%"PRIu64"\n"),
++ SNPRINTF(szBlocksInfo, i18n("Block size:...................%" PRIu64 " bytes\n"
++ "Total blocks count:...........%" PRIu64 "\n"
++ "Used blocks count:............%" PRIu64 "\n"
++ "Free blocks count:............%" PRIu64 "\n"),
+ m_header.qwBlockSize,
+ m_header.qwBlocksCount,
+ m_header.qwUsedBlocks,
+@@ -745,7 +745,7 @@
+ }
+
+ snprintf(szDest, nMaxLen, i18n("%s" // Blocks infos
+- "Space usage:..................%"PRIu64" %%\n"
++ "Space usage:..................%" PRIu64 " %%\n"
+ "Used space:...................%s\n"
+ "Free space:...................%s\n"
+ "Bitmap size:..................%s\n"
+--- a/src/client/fs/fs_hfs.cpp
++++ b/src/client/fs/fs_hfs.cpp
+@@ -142,10 +142,10 @@
+ getStdInfos(szText, sizeof(szText), true);
+
+ SNPRINTF(szFullText, i18n("%s" // standard infos
+- "Allocation Group count:.......%"PRIu64"\n"
++ "Allocation Group count:.......%" PRIu64 "\n"
+ "Blocks per Allocation Group:..%u\n"
+ "Allocation Group size:........%s\n"
+- "First allocation block:.......%"PRIu64"\n"),
++ "First allocation block:.......%" PRIu64 "\n"),
+ szText, m_info.qwAllocCount, m_info.dwBlocksPerAlloc,
+ formatSize(m_info.dwAllocSize,szTemp1), m_info.qwFirstAllocBlock);
+
+--- a/src/client/fs/fs_ntfs.cpp
++++ b/src/client/fs/fs_ntfs.cpp
+@@ -312,7 +312,7 @@
+ "Bytes per sector:.............%u\n"
+ "Sectors per cluster:..........%u\n"
+ "File record size:.............%u\n"
+- "LCN of MFT Data attrib:.......%"PRIu64"\n"),
++ "LCN of MFT Data attrib:.......%" PRIu64 "\n"),
+ szText, m_info.nBytesPerSector, m_info.cSectorsPerCluster,
+ m_info.dwFileRecordSize, m_info.qwLCNOfMftDataAttrib);
+
+@@ -730,7 +730,7 @@
+ QWORD i;
+
+ for (i=0L; i < m_qwClustersCount; i++)
+- fprintf(stderr, "cluster[%llu] = %"PRIu64"\n", (long long unsigned int)i, m_qwOffset[i]);
++ fprintf(stderr, "cluster[%llu] = %" PRIu64 "\n", (long long unsigned int)i, m_qwOffset[i]);
+
+ }
+
+--- a/src/client/fs/fs_ufs.cpp
++++ b/src/client/fs/fs_ufs.cpp
+@@ -217,7 +217,7 @@
+ "Cylinder group size:..........%s\n"
+ "Basic blocks per CG:..........%u\n"
+ "Basic block size:.............%u\n"
+- "Data frags count:.............%"PRIu64"\n"),
++ "Data frags count:.............%" PRIu64 "\n"),
+ szText, m_info.dwCylinderGroupsCount,
+ formatSize(m_info.dwCylinderGroupSize*m_info.dwBasicBlockSize,szTemp1),
+ m_info.dwCylinderGroupSize, m_info.dwBasicBlockSize, m_info.qwDataFrags);
+--- a/src/shared/common.cpp
++++ b/src/shared/common.cpp
+@@ -272,7 +272,7 @@
+
+ if (qwSize < llKiloB) // In Bytes
+ {
+- snprintf(szText, nMaxLen, i18n("%"PRId64" bytes"), qwSize);
++ snprintf(szText, nMaxLen, i18n("%" PRId64 " bytes"), qwSize);
+ }
+ else if (qwSize < llMegaB) // In KiloBytes
+ {
+@@ -311,7 +311,7 @@
+
+ if (qwSize < llKiloB) // In Bytes
+ {
+- snprintf(szText, nMaxLen, i18n("%"PRId64" Bytes"), qwSize);
++ snprintf(szText, nMaxLen, i18n("%" PRId64 " Bytes"), qwSize);
+ }
+ else if (qwSize < llMegaB) // In KiloBytes
+ {
diff --git a/sys-block/partimage/files/partimage-0.6.9-zlib-1.2.5.2-r1.patch b/sys-block/partimage/files/partimage-0.6.9-zlib-1.2.5.2-r1.patch
new file mode 100644
index 000000000000..05150e131e36
--- /dev/null
+++ b/sys-block/partimage/files/partimage-0.6.9-zlib-1.2.5.2-r1.patch
@@ -0,0 +1,33 @@
+http://bugs.gentoo.org/405323
+
+--- a/src/client/imagefile.cpp
++++ b/src/client/imagefile.cpp
+@@ -783,7 +783,7 @@
+ else if (m_options.dwCompression == COMPRESS_GZIP) // Gzip compression
+ {
+ showDebug(1, "open gzip\n");
+- m_gzImageFile = (gzFile *) gzdopen(m_nFdImage, "wb"); //"wb1h");
++ m_gzImageFile = gzdopen(m_nFdImage, "wb"); //"wb1h");
+ if (m_gzImageFile == NULL)
+ {
+ showDebug(1, "error:%d %s\n", errno, strerror(errno));
+@@ -1098,7 +1098,7 @@
+ }
+ else if (m_options.dwCompression == COMPRESS_GZIP) // Gzip compression
+ {
+- m_gzImageFile = (gzFile *) gzdopen(m_nFdImage, "rb");
++ m_gzImageFile = gzdopen(m_nFdImage, "rb");
+ if (m_gzImageFile == NULL)
+ THROW(ERR_ERRNO, errno);
+ else
+--- a/src/client/imagefile.h
++++ b/src/client/imagefile.h
+@@ -41,7 +41,7 @@
+ COptions m_options;
+
+ FILE *m_fImageFile;
+- gzFile *m_gzImageFile;
++ gzFile m_gzImageFile;
+ BZFILE *m_bzImageFile;
+
+ int m_nFdImage;
diff --git a/sys-block/partimage/partimage-0.6.9-r3.ebuild b/sys-block/partimage/partimage-0.6.9-r3.ebuild
new file mode 100644
index 000000000000..acd0d0f68be4
--- /dev/null
+++ b/sys-block/partimage/partimage-0.6.9-r3.ebuild
@@ -0,0 +1,141 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic pam
+
+DESCRIPTION="Console-based application to efficiently save raw partition data to image file"
+HOMEPAGE="https://www.partimage.org/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~sparc ~x86"
+IUSE="nls nologin pam ssl static"
+REQUIRED_USE="static? ( !pam )"
+
+COMMON_DEPEND="
+ acct-group/partimag
+ acct-user/partimag
+"
+LIBS_DEPEND="
+ app-arch/bzip2
+ >=dev-libs/newt-0.52
+ >=sys-libs/slang-2
+ sys-libs/zlib:=
+ !nologin? ( virtual/libcrypt:= )
+ ssl? ( dev-libs/openssl:0= )
+"
+PAM_DEPEND="pam? ( sys-libs/pam )"
+RDEPEND="
+ ${COMMON_DEPEND}
+ ${PAM_DEPEND}
+ !static? ( ${LIBS_DEPEND} )
+"
+DEPEND="
+ ${PAM_DEPEND}
+ ${LIBS_DEPEND}
+"
+BDEPEND="
+ ${COMMON_DEPEND}
+ nls? ( sys-devel/gettext )
+"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.6.9-zlib-1.2.5.2-r1.patch #405323
+ "${FILESDIR}"/${PN}-0.6.9-minor-typo.patch #580290
+ "${FILESDIR}"/${PN}-0.6.9-openssl-1.1-compatibility.patch
+ "${FILESDIR}"/${PN}-0.6.9-missing-includes.patch
+ "${FILESDIR}"/${PN}-0.6.9-clang.patch
+)
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
+src_configure() {
+ # XXX: Do we still need these?
+ filter-flags -fno-exceptions
+ use ppc && append-flags -fsigned-char
+
+ local myeconfargs=(
+ $(use_enable nls)
+ $(usex nologin '--disable-login' '')
+ $(use_enable pam)
+ $(use_enable ssl)
+ $(use_enable static all-static)
+ --with-log-dir="${EPREFIX}"/var/log/partimage
+ )
+
+ econf "${myeconfargs[@]}"
+}
+
+src_install() {
+ default
+
+ keepdir /var/lib/partimage
+ keepdir /var/log/partimage
+
+ newinitd "${FILESDIR}"/partimaged.init.2 partimaged
+ newconfd "${FILESDIR}"/partimaged.conf partimaged
+
+ if use pam; then
+ newpamd "${FILESDIR}"/partimaged.pam.2 partimaged
+ fi
+
+ if use ssl; then
+ insinto /etc/partimaged
+ doins "${FILESDIR}"/servercert.cnf
+ fi
+
+ fowners partimag:root /etc/partimaged/partimagedusers
+}
+
+pkg_config() {
+ if use ssl; then
+ local confdir="${EROOT}"/etc/partimaged
+ local privkey="${confdir}"/partimaged.key
+ local cnf="${confdir}"/servercert.cnf
+ local csr="${confdir}"/partimaged.csr
+ local cert="${confdir}"/partimaged.cert
+
+ ewarn "Please customize /etc/partimaged/servercert.cnf before you continue!"
+ ewarn "Press Ctrl-C to break now for it, or press enter to continue."
+ read
+ if [ ! -f "${privkey}" ]; then
+ einfo "Generating unencrypted private key: ${privkey}"
+ openssl genrsa -out "${privkey}" 2048 || die
+ else
+ einfo "Private key already exists: ${privkey}"
+ fi
+ if [ ! -f "${csr}" ]; then
+ einfo "Generating certificate request: ${csr}"
+ openssl req -new -x509 -outform PEM -out "${csr}" -key "${privkey}" -config "${cnf}" || die
+ else
+ einfo "Certificate request already exists: ${csr}"
+ fi
+ if [ ! -f "${cert}" ]; then
+ einfo "Generating self-signed certificate: ${cert}"
+ openssl x509 -in "${csr}" -out "${cert}" -signkey "${privkey}" || die
+ else
+ einfo "Self-signed certifcate already exists: ${cert}"
+ fi
+ einfo "Setting permissions"
+ chmod 600 "${privkey}" || die
+ chown partimag:root "${privkey}" || die
+ chmod 644 "${cert}" "${csr}" || die
+ chown root:root "${cert}" "${csr}" || die
+ einfo "Done"
+ else
+ einfo "SSL is disabled, not building certificates"
+ fi
+}
+
+pkg_postinst() {
+ if use ssl; then
+ einfo "To create the required SSL certificates, please do:"
+ einfo "emerge --config =${PF}"
+ fi
+}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-block/partimage/, sys-block/partimage/files/
@ 2022-05-18 21:02 Conrad Kostecki
0 siblings, 0 replies; 5+ messages in thread
From: Conrad Kostecki @ 2022-05-18 21:02 UTC (permalink / raw
To: gentoo-commits
commit: e4e2ea5bf48e74ec74463b9fc6038fda7807e242
Author: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Wed May 18 21:00:16 2022 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Wed May 18 21:00:16 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4e2ea5b
sys-block/partimage: drop 0.6.9-r2
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
.../files/partimage-0.6.9-zlib-1.2.5.2.patch | 33 -----
sys-block/partimage/partimage-0.6.9-r2.ebuild | 144 ---------------------
2 files changed, 177 deletions(-)
diff --git a/sys-block/partimage/files/partimage-0.6.9-zlib-1.2.5.2.patch b/sys-block/partimage/files/partimage-0.6.9-zlib-1.2.5.2.patch
deleted file mode 100644
index 57f87a5d5225..000000000000
--- a/sys-block/partimage/files/partimage-0.6.9-zlib-1.2.5.2.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-http://bugs.gentoo.org/405323
-
---- src/client/imagefile.cpp
-+++ src/client/imagefile.cpp
-@@ -783,7 +783,7 @@
- else if (m_options.dwCompression == COMPRESS_GZIP) // Gzip compression
- {
- showDebug(1, "open gzip\n");
-- m_gzImageFile = (gzFile *) gzdopen(m_nFdImage, "wb"); //"wb1h");
-+ m_gzImageFile = gzdopen(m_nFdImage, "wb"); //"wb1h");
- if (m_gzImageFile == NULL)
- {
- showDebug(1, "error:%d %s\n", errno, strerror(errno));
-@@ -1098,7 +1098,7 @@
- }
- else if (m_options.dwCompression == COMPRESS_GZIP) // Gzip compression
- {
-- m_gzImageFile = (gzFile *) gzdopen(m_nFdImage, "rb");
-+ m_gzImageFile = gzdopen(m_nFdImage, "rb");
- if (m_gzImageFile == NULL)
- THROW(ERR_ERRNO, errno);
- else
---- src/client/imagefile.h
-+++ src/client/imagefile.h
-@@ -41,7 +41,7 @@
- COptions m_options;
-
- FILE *m_fImageFile;
-- gzFile *m_gzImageFile;
-+ gzFile m_gzImageFile;
- BZFILE *m_bzImageFile;
-
- int m_nFdImage;
diff --git a/sys-block/partimage/partimage-0.6.9-r2.ebuild b/sys-block/partimage/partimage-0.6.9-r2.ebuild
deleted file mode 100644
index 34732ed47292..000000000000
--- a/sys-block/partimage/partimage-0.6.9-r2.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools flag-o-matic pam user
-
-DESCRIPTION="Console-based application to efficiently save raw partition data to image file"
-HOMEPAGE="http://www.partimage.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc ~sparc x86"
-IUSE="nls nologin pam ssl static"
-
-LIBS_DEPEND="app-arch/bzip2
- >=dev-libs/newt-0.52
- >=sys-libs/slang-2
- sys-libs/zlib:=
- !nologin? ( virtual/libcrypt:= )
- ssl? ( dev-libs/openssl:0= )"
-PAM_DEPEND="!static? ( pam? ( sys-libs/pam ) )"
-RDEPEND="${PAM_DEPEND}
- !static? ( ${LIBS_DEPEND} )"
-DEPEND="${PAM_DEPEND}
- ${LIBS_DEPEND}
- nls? ( sys-devel/gettext )"
-
-pkg_setup() {
- enewgroup partimag 91
- enewuser partimag 91 -1 /var/lib/partimage partimag
-}
-
-src_prepare() {
- eapply -p0 "${FILESDIR}"/${P}-zlib-1.2.5.2.patch #405323
- eapply "${FILESDIR}"/${P}-minor-typo.patch #580290
- eapply "${FILESDIR}"/${P}-openssl-1.1-compatibility.patch
- eapply "${FILESDIR}"/${P}-missing-includes.patch
-
- eapply_user
-
- eautoreconf
-}
-
-src_configure() {
- # XXX: Do we still need these?
- filter-flags -fno-exceptions
- use ppc && append-flags -fsigned-char
-
- local myconf
-
- use nologin && myconf="${myconf} --disable-login"
-
- if use pam && ! use static; then
- myconf="${myconf} --enable-pam"
- fi
-
- econf \
- $(use_enable nls) \
- $(use_enable ssl) \
- --disable-pam \
- $(use_enable static all-static) \
- --with-log-dir="${EPREFIX}"/var/log/partimage \
- ${myconf}
-}
-
-src_install() {
- default
-
- keepdir /var/lib/partimage
- keepdir /var/log/partimage
-
- newinitd "${FILESDIR}"/partimaged.init.2 partimaged
- newconfd "${FILESDIR}"/partimaged.conf partimaged
-
- if use ssl; then
- insinto /etc/partimaged
- doins "${FILESDIR}"/servercert.cnf
- fi
-
- if use pam; then
- newpamd "${FILESDIR}"/partimaged.pam.2 partimaged
- fi
-}
-
-confdir=${EROOT%/}/etc/partimaged
-privkey=${confdir}/partimaged.key
-cnf=${confdir}/servercert.cnf
-csr=${confdir}/partimaged.csr
-cert=${confdir}/partimaged.cert
-
-pkg_config() {
- if use ssl; then
- ewarn "Please customize /etc/partimaged/servercert.cnf before you continue!"
- ewarn "Press Ctrl-C to break now for it, or press enter to continue."
- read
- if [ ! -f ${privkey} ]; then
- einfo "Generating unencrypted private key: ${privkey}"
- openssl genrsa -out ${privkey} 1024 || die
- else
- einfo "Private key already exists: ${privkey}"
- fi
- if [ ! -f ${csr} ]; then
- einfo "Generating certificate request: ${csr}"
- openssl req -new -x509 -outform PEM -out ${csr} -key ${privkey} -config ${cnf} || die
- else
- einfo "Certificate request already exists: ${csr}"
- fi
- if [ ! -f ${cert} ]; then
- einfo "Generating self-signed certificate: ${cert}"
- openssl x509 -in ${csr} -out ${cert} -signkey ${privkey} || die
- else
- einfo "Self-signed certifcate already exists: ${cert}"
- fi
- einfo "Setting permissions"
- partimagesslperms || die
- einfo "Done"
- else
- einfo "SSL is disabled, not building certificates"
- fi
-}
-
-partimagesslperms() {
- local ret=0
- chmod 600 ${privkey} 2>/dev/null
- ret=$((${ret}+$?))
- chown partimag:0 ${privkey} 2>/dev/null
- ret=$((${ret}+$?))
- chmod 644 ${cert} ${csr} 2>/dev/null
- ret=$((${ret}+$?))
- chown root:0 ${cert} ${csr} 2>/dev/null
- ret=$((${ret}+$?))
- return $ret
-}
-
-pkg_postinst() {
- if use ssl; then
- einfo "To create the required SSL certificates, please do:"
- einfo "emerge --config =${PF}"
- partimagesslperms
- return 0
- fi
- chown partimag:0 "${EROOT%/}"/etc/partimaged/partimagedusers || die
-}
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2022-05-18 21:02 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-12-29 7:21 [gentoo-commits] repo/gentoo:master commit in: sys-block/partimage/, sys-block/partimage/files/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2022-05-18 21:02 Conrad Kostecki
2022-04-02 18:36 Conrad Kostecki
2019-01-04 20:54 Thomas Deutschmann
2016-04-19 22:39 Mike Frysinger
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox