pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/security/pinepgp
Module Name: pkgsrc
Committed By: ryoon
Date: Sat Sep 9 11:43:08 UTC 2017
Modified Files:
pkgsrc/security/pinepgp: Makefile distinfo
Added Files:
pkgsrc/security/pinepgp: options.mk
pkgsrc/security/pinepgp/patches: patch-Makefile.in patch-pinegpgp.in
patch-pinepgpgpg-install.in
Log Message:
Fix BASH substitutions with modern GCC, PR pkg/52534
* Bump PKGREVISION
* Use options framework for gpg and pgp5
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 pkgsrc/security/pinepgp/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/security/pinepgp/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/security/pinepgp/options.mk
cvs rdiff -u -r0 -r1.1 pkgsrc/security/pinepgp/patches/patch-Makefile.in \
pkgsrc/security/pinepgp/patches/patch-pinegpgp.in \
pkgsrc/security/pinepgp/patches/patch-pinepgpgpg-install.in
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/security/pinepgp/Makefile
diff -u pkgsrc/security/pinepgp/Makefile:1.18 pkgsrc/security/pinepgp/Makefile:1.19
--- pkgsrc/security/pinepgp/Makefile:1.18 Thu Jan 19 18:52:24 2017
+++ pkgsrc/security/pinepgp/Makefile Sat Sep 9 11:43:08 2017
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.18 2017/01/19 18:52:24 agc Exp $
+# $NetBSD: Makefile,v 1.19 2017/09/09 11:43:08 ryoon Exp $
#
DISTNAME= pinepgp-0.18.0
-PKGREVISION= 4
+PKGREVISION= 5
CATEGORIES= security mail
MASTER_SITES= http://hany.sk/~hany/_data/pinepgp/
MASTER_SITES+= http://terminus.sk/~hany/_data/pinepgp/
@@ -10,6 +10,7 @@ MASTER_SITES+= http://terminus.sk/~hany
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
HOMEPAGE= http://hany.sk/~hany/software/pinepgp/stable.html
COMMENT= PGP display and sending filters for pine
+LICENSE= gnu-lgpl-v2.1
DEPENDS+= bash>=2:../../shells/bash
@@ -18,15 +19,6 @@ GNU_CONFIGURE= yes
USE_TOOLS+= cat
CONFIGURE_ENV+= CAT=${TOOLS_CAT:Q}
-PINEPGP_USEGPG?= yes
-PINEPGP_USEPGP5?= yes
-
-.if !empty(PINEPGP_USEGPG:M[yY][eE][sS])
-DEPENDS+= gnupg>=1.2.3:../../security/gnupg
-.endif
-
-.if !empty(PINEPGP_USEPGP5:M[yY][eE][sS])
-DEPENDS+= pgp5>=5.0:../../security/pgp5
-.endif
+.include "options.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/security/pinepgp/distinfo
diff -u pkgsrc/security/pinepgp/distinfo:1.3 pkgsrc/security/pinepgp/distinfo:1.4
--- pkgsrc/security/pinepgp/distinfo:1.3 Wed Nov 4 01:18:01 2015
+++ pkgsrc/security/pinepgp/distinfo Sat Sep 9 11:43:08 2017
@@ -1,6 +1,9 @@
-$NetBSD: distinfo,v 1.3 2015/11/04 01:18:01 agc Exp $
+$NetBSD: distinfo,v 1.4 2017/09/09 11:43:08 ryoon Exp $
SHA1 (pinepgp-0.18.0.tar.gz) = d80495079f398d60a7c6262f0778fbf0db6ecaf2
RMD160 (pinepgp-0.18.0.tar.gz) = 1990bdc56460cbafe8b62cffaf5520038fe910ce
SHA512 (pinepgp-0.18.0.tar.gz) = b28b71d4d5132b451ff4a2a9489f830cedade300d18ad05a0aa443bffa6fe5ece7be4f166e7428fc999b2d1b550cf8dccf7982314868db8597117d0f8d74686e
Size (pinepgp-0.18.0.tar.gz) = 38103 bytes
+SHA1 (patch-Makefile.in) = f35fa516c93d283a7e5ed1b79546b52c70b59760
+SHA1 (patch-pinegpgp.in) = f55366a4599ae25bea347e61fe81c3fe2c4f1763
+SHA1 (patch-pinepgpgpg-install.in) = 034558e85acb65650188d2d0d9147c9ca4fef3f2
Added files:
Index: pkgsrc/security/pinepgp/options.mk
diff -u /dev/null pkgsrc/security/pinepgp/options.mk:1.1
--- /dev/null Sat Sep 9 11:43:08 2017
+++ pkgsrc/security/pinepgp/options.mk Sat Sep 9 11:43:08 2017
@@ -0,0 +1,17 @@
+# $NetBSD: options.mk,v 1.1 2017/09/09 11:43:08 ryoon Exp $
+
+PKG_OPTIONS_VAR= PKG_OPTIONS.pinepgp
+
+PKG_SUPPORTED_OPTIONS= gpg pgp5
+PKG_SUGGESTED_OPTIONS= gpg
+PLIST_VARS= gpg pgp5
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mgpg)
+DEPENDS+= gnupg>=1.2.3:../../security/gnupg
+.endif
+
+.if !empty(PKG_OPTIONS:Mpgp5)
+DEPENDS+= pgp5>=5.0:../../security/pgp5
+.endif
Index: pkgsrc/security/pinepgp/patches/patch-Makefile.in
diff -u /dev/null pkgsrc/security/pinepgp/patches/patch-Makefile.in:1.1
--- /dev/null Sat Sep 9 11:43:08 2017
+++ pkgsrc/security/pinepgp/patches/patch-Makefile.in Sat Sep 9 11:43:08 2017
@@ -0,0 +1,64 @@
+$NetBSD: patch-Makefile.in,v 1.1 2017/09/09 11:43:08 ryoon Exp $
+
+* Defer BASH substitutions
+
+--- Makefile.in.orig 2002-05-03 13:30:07.000000000 +0000
++++ Makefile.in
+@@ -48,7 +48,6 @@ $(SOURCES): $(SOURCES:%=%.in)
+ s%\@CAT\@%$(CAT)%;\
+ s%\@RM\@%$(RM)%;\
+ s%\@MKTEMP\@%$(MKTEMP)%;\
+- s%\@BASH\@%$(BASH)%;\
+ s%\@bindir\@%$(bindir)%;\
+ s%\@tmpdir\@%$(tmpdir)%' > $(@)
+ chmod 755 $(@)
+@@ -60,7 +59,8 @@ pinegpg: pinegpgp
+ s%^cese=.*%cese="$(GPG) -at -se"%;\
+ s%^cec=.*%cec="\$(GPG)"%;\
+ s%^cefp=.*%cefp=gpg%' > $(@).c
+- $(CPP) -DGPG $(BUILD_FLAGS) $(@).c | $(GREP) -v "^# .* .*" > $(@)
++ $(CPP) -DGPG $(BUILD_FLAGS) $(@).c | $(GREP) -v "^# .* .*" | \
++ ${SED} -e 's%\@BASH\@%#!$(BASH)%' > $(@)
+ chmod 755 $(@)
+
+ pinepgp26x: pinegpgp
+@@ -70,7 +70,8 @@ pinepgp26x: pinegpgp
+ s%^cese=.*%cese="\$(PGP) -fat -se"%;\
+ s%^cec=.*%cec="\$(PGP) -f"%;\
+ s%^cefp=.*%cefp=pgp26x%' > $(@).c
+- $(CPP) -DPGP26X $(BUILD_FLAGS) $(@).c | $(GREP) -v "^# .* .*" > $(@)
++ $(CPP) -DPGP26X $(BUILD_FLAGS) $(@).c | $(GREP) -v "^# .* .*" | \
++ ${SED} -e 's%\@BASH\@%#!$(BASH)%' > $(@)
+ chmod 755 $(@)
+
+ pinepgp5x: pinegpgp
+@@ -80,7 +81,8 @@ pinepgp5x: pinegpgp
+ s%^cese=.*%cese="$(PGP5E) -fat -s"%;\
+ s%^cec=.*%cec="$(PGP5V) -f"%;\
+ s%^cefp=.*%cefp=pgp26x%' > $(@).c
+- $(CPP) -DPGP5X $(BUILD_FLAGS) $(@).c | $(GREP) -v "^# .* .*" > $(@)
++ $(CPP) -DPGP5X $(BUILD_FLAGS) $(@).c | $(GREP) -v "^# .* .*" | \
++ ${SED} -e 's%\@BASH\@%#!$(BASH)%' > $(@)
+ chmod 755 $(@)
+
+ pinepgp65x: pinegpgp
+@@ -90,13 +92,18 @@ pinepgp65x: pinegpgp
+ s%^cese=.*%cese="\$(PGP6) -fat -se -u $$USER"%;\
+ s%^cec=.*%cec="\$(PGP6) -f -u $$USER"%;\
+ s%^cefp=.*%cefp=pgp65x%' > $(@).c
+- $(CPP) -DPGP65X $(BUILD_FLAGS) $(@).c | $(GREP) -v "^# .* .*" > $(@)
++ $(CPP) -DPGP65X $(BUILD_FLAGS) $(@).c | $(GREP) -v "^# .* .*" | \
++ ${SED} -e 's%\@BASH\@%#!$(BASH)%' > $(@)
+ chmod 755 $(@)
+
+ install: $(BUILD_FILTERS:%=install-%)
+
+ install-pinepgpgpg-install: pinepgpgpg-install
+ mkdir -p $(DESTDIR)$(bindir)
++ ${CAT} pinepgpgpg-install | \
++ ${SED} -e 's%\@BASH\@%#!$(BASH)%' > \
++ pinepgpgpg-install.1
++ mv pinepgpgpg-install.1 pinepgpgpg-install
+ $(INSTALL) -m 755 pinepgpgpg-install $(DESTDIR)$(bindir)
+
+ $(BUILD_FILTERS:%=install-%-install): install-pinepgpgpg-install
Index: pkgsrc/security/pinepgp/patches/patch-pinegpgp.in
diff -u /dev/null pkgsrc/security/pinepgp/patches/patch-pinegpgp.in:1.1
--- /dev/null Sat Sep 9 11:43:08 2017
+++ pkgsrc/security/pinepgp/patches/patch-pinegpgp.in Sat Sep 9 11:43:08 2017
@@ -0,0 +1,12 @@
+$NetBSD: patch-pinegpgp.in,v 1.1 2017/09/09 11:43:08 ryoon Exp $
+
+* Defer BASH substitution
+
+--- pinegpgp.in.orig 2002-05-03 13:30:07.000000000 +0000
++++ pinegpgp.in
+@@ -1,4 +1,4 @@
+-#!@BASH@
++@BASH@
+
+ tmpdir=@tmpdir@
+
Index: pkgsrc/security/pinepgp/patches/patch-pinepgpgpg-install.in
diff -u /dev/null pkgsrc/security/pinepgp/patches/patch-pinepgpgpg-install.in:1.1
--- /dev/null Sat Sep 9 11:43:08 2017
+++ pkgsrc/security/pinepgp/patches/patch-pinepgpgpg-install.in Sat Sep 9 11:43:08 2017
@@ -0,0 +1,12 @@
+$NetBSD: patch-pinepgpgpg-install.in,v 1.1 2017/09/09 11:43:08 ryoon Exp $
+
+* Defer BASH substitution
+
+--- pinepgpgpg-install.in.orig 2002-05-03 13:30:07.000000000 +0000
++++ pinepgpgpg-install.in
+@@ -1,4 +1,4 @@
+-#!@BASH@
++@BASH@
+
+ bindir=@bindir@
+ tmpdir=@tmpdir@
Home |
Main Index |
Thread Index |
Old Index