pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/security/pinepgp Fix BASH substitutions with modern GC...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/f16629cb322c
branches:  trunk
changeset: 367971:f16629cb322c
user:      ryoon <ryoon%pkgsrc.org@localhost>
date:      Sat Sep 09 11:43:08 2017 +0000

description:
Fix BASH substitutions with modern GCC, PR pkg/52534

* Bump PKGREVISION
* Use options framework for gpg and pgp5

diffstat:

 security/pinepgp/Makefile                            |  16 +---
 security/pinepgp/distinfo                            |   5 +-
 security/pinepgp/options.mk                          |  17 +++++
 security/pinepgp/patches/patch-Makefile.in           |  64 ++++++++++++++++++++
 security/pinepgp/patches/patch-pinegpgp.in           |  12 +++
 security/pinepgp/patches/patch-pinepgpgpg-install.in |  12 +++
 6 files changed, 113 insertions(+), 13 deletions(-)

diffs (174 lines):

diff -r f60df6a5e59b -r f16629cb322c security/pinepgp/Makefile
--- a/security/pinepgp/Makefile Sat Sep 09 07:55:31 2017 +0000
+++ b/security/pinepgp/Makefile Sat Sep 09 11:43:08 2017 +0000
@@ -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 @@
 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 @@
 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"
diff -r f60df6a5e59b -r f16629cb322c security/pinepgp/distinfo
--- a/security/pinepgp/distinfo Sat Sep 09 07:55:31 2017 +0000
+++ b/security/pinepgp/distinfo Sat Sep 09 11:43:08 2017 +0000
@@ -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
diff -r f60df6a5e59b -r f16629cb322c security/pinepgp/options.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/security/pinepgp/options.mk       Sat Sep 09 11:43:08 2017 +0000
@@ -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
diff -r f60df6a5e59b -r f16629cb322c security/pinepgp/patches/patch-Makefile.in
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/security/pinepgp/patches/patch-Makefile.in        Sat Sep 09 11:43:08 2017 +0000
@@ -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
diff -r f60df6a5e59b -r f16629cb322c security/pinepgp/patches/patch-pinegpgp.in
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/security/pinepgp/patches/patch-pinegpgp.in        Sat Sep 09 11:43:08 2017 +0000
@@ -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@
+ 
diff -r f60df6a5e59b -r f16629cb322c security/pinepgp/patches/patch-pinepgpgpg-install.in
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/security/pinepgp/patches/patch-pinepgpgpg-install.in      Sat Sep 09 11:43:08 2017 +0000
@@ -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