pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
pxz: Convert to use GitHub framework
Module Name: pkgsrc-wip
Committed By: Ryo ONODERA <ryoon%NetBSD.org@localhost>
Pushed By: ryoon
Date: Sat Apr 17 01:11:01 2021 +0900
Changeset: c3ffbbebaba266981dcbea16ee54d55a93cf05e9
Modified Files:
pxz/Makefile
pxz/distinfo
pxz/patches/patch-pxz.c
Log Message:
pxz: Convert to use GitHub framework
* Take MAINTAINERship.
* Do not use AUTO_MKDIRS, use INSTALLATION_DIRS instead.
* Buildlink to archivers/xz.
* Use version number in Makefile.
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=c3ffbbebaba266981dcbea16ee54d55a93cf05e9
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
pxz/Makefile | 15 +++++++--------
pxz/distinfo | 7 ++++++-
pxz/patches/patch-pxz.c | 17 ++++-------------
3 files changed, 17 insertions(+), 22 deletions(-)
diffs:
diff --git a/pxz/Makefile b/pxz/Makefile
index 0d98b50e95..1de1a87d0e 100644
--- a/pxz/Makefile
+++ b/pxz/Makefile
@@ -1,22 +1,21 @@
# $NetBSD: Makefile,v 1.1 2015/06/16 18:28:35 ishit Exp $
-DISTNAME= pxz-4.999.9b4
+GITHUB_PROJECT= pxz
+GITHUB_TAG= 124382a6d0832b13b7c091f72264f8f3f463070a
+DISTNAME= pxz-4.999.9beta
CATEGORIES= archivers
-GIT_REPO= https://github.com/jnovy/pxz.git
+MASTER_SITES= ${MASTER_SITE_GITHUB:=jnovy/}
-MAINTAINER= ishit%users.sourceforge.net@localhost
+MAINTAINER= ryoon%NetBSD.org@localhost
HOMEPAGE= https://jnovy.fedorapeople.org/pxz/
COMMENT= Parallel LZMA compressor using liblzma
LICENSE= gnu-gpl-v2
-DEPENDS+= xz>=5:../../archivers/xz
-
-_GIT_FLAGS?= --depth 1
-AUTO_MKDIRS= yes
+INSTALLATION_DIRS+= bin ${PKGMANDIR}/man1
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/pxz ${DESTDIR}${PREFIX}/bin
${INSTALL_MAN} ${WRKSRC}/pxz.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
-.include "../../wip/mk/git-package.mk"
+.include "../../archivers/xz/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/pxz/distinfo b/pxz/distinfo
index 772d7b0a3c..1fe9b335d6 100644
--- a/pxz/distinfo
+++ b/pxz/distinfo
@@ -1,2 +1,7 @@
$NetBSD: distinfo,v 1.3 2015/06/20 19:25:53 ishit Exp $
-SHA1 (patch-pxz.c) = 1561e559e023776d7d5398980dc816fa3f4c761e
+
+SHA1 (pxz-4.999.9beta-124382a6d0832b13b7c091f72264f8f3f463070a.tar.gz) = 403d83c0b0e1430491857fbd88c4ade12891c8ce
+RMD160 (pxz-4.999.9beta-124382a6d0832b13b7c091f72264f8f3f463070a.tar.gz) = e68c7d049e9714a0b1f177395c6ebafc104c283f
+SHA512 (pxz-4.999.9beta-124382a6d0832b13b7c091f72264f8f3f463070a.tar.gz) = 7675e3839764afc27e737d596080440d98c45e27b355036551acb5a1c09851abf26c419d431a62d5c635e5c11c3e638980e7516c1c774cc991b3ededef4b388a
+Size (pxz-4.999.9beta-124382a6d0832b13b7c091f72264f8f3f463070a.tar.gz) = 12291 bytes
+SHA1 (patch-pxz.c) = 23009478fbf4796805828bfb59bfeb912a49a895
diff --git a/pxz/patches/patch-pxz.c b/pxz/patches/patch-pxz.c
index 53d590a05c..a7c28694e5 100644
--- a/pxz/patches/patch-pxz.c
+++ b/pxz/patches/patch-pxz.c
@@ -6,7 +6,7 @@ fixed CVE.
cf. FreeBSD's ports
cf. Debian's deb fix CVE patch
---- pxz.c.orig 2015-06-16 17:31:51.000000000 +0000
+--- pxz.c.orig 2019-05-07 15:08:53.000000000 +0000
+++ pxz.c
@@ -23,11 +23,17 @@
@@ -37,7 +37,7 @@ cf. Debian's deb fix CVE patch
#ifndef XZ_BINARY
#define XZ_BINARY "xz"
#endif
-@@ -121,6 +131,13 @@ const struct option long_opts[] = {
+@@ -132,6 +142,13 @@ const struct option long_opts[] = {
{ NULL, 0, NULL, 0 }
};
@@ -48,15 +48,6 @@ cf. Debian's deb fix CVE patch
+}
+#endif
+
- void __attribute__((noreturn)) run_xz( char **argv ) {
- execvp(XZ_BINARY, argv);
+ void __attribute__((noreturn)) run_xz( char **argv, char **envp ) {
+ execve(XZ_BINARY, argv, envp);
error(0, errno, "execution of "XZ_BINARY" binary failed");
-@@ -289,6 +306,8 @@ int main( int argc, char **argv ) {
- }
-
- fo = stdout;
-+ /* for fix CVE-2015-1200 */
-+ umask(077);
- if ( std_in ) {
- fi = stdin;
- } else {
Home |
Main Index |
Thread Index |
Old Index