From 05dc5dce0339471fa544b431aa361d2b1f4c5786 Mon Sep 17 00:00:00 2001 From: Jameson Graef Rollins Date: Sat, 4 Apr 2009 20:30:57 -0700 Subject: some updates to the macports package. actually installs things properly now, but there are still some run-time issues to sort out. --- packaging/macports/Portfile | 25 ++++++++++--------------- 1 file changed, 10 insertions(+), 15 deletions(-) (limited to 'packaging/macports/Portfile') diff --git a/packaging/macports/Portfile b/packaging/macports/Portfile index 99d0d69..9680b4e 100644 --- a/packaging/macports/Portfile +++ b/packaging/macports/Portfile @@ -2,14 +2,11 @@ # $Id$ PortSystem 1.0 - name monkeysphere version 0.24 -categories net +categories net security maintainers nomaintainer -platforms darwin description use the OpenPGP web of trust to verify ssh connections - long_description SSH key-based authentication is tried-and-true, \ but it lacks a true Public Key Infrastructure for \ key certification, revocation and expiration. \ @@ -18,12 +15,8 @@ long_description SSH key-based authentication is tried-and-true, \ used in both directions: for users to get \ validated host keys, and for hosts to authenticate \ users. - homepage http://web.monkeysphere.info/ -master_sites http://archive.monkeysphere.info/debian/pool/monkeysphere/m/monkeysphere/ -distname ${name}_${version} -worksrcdir ${name}-${version} -checksums md5 8590532f4702fa44027a6a583657c9ef +platforms darwin depends_run bin:ssh:openssh \ port:gnupg \ @@ -32,9 +25,11 @@ depends_run bin:ssh:openssh \ port:p5-digest-sha1 \ port:procmail -build.target build -destroot.args PREFIX=${destroot}${prefix} \ - CONFDIR=${destroot}${prefix}/etc/monkeysphere \ - DBDIR=${destroot}${prefix}/var/lib/monkeysphere \ - MANDIR=${destroot}${prefix}/share/man \ - DOCDIR=${destroot}${prefix}/share/doc/monkeysphere +master_sites http://archive.monkeysphere.info/debian/pool/monkeysphere/m/monkeysphere/ +distname ${name}_${version} +extract.suffix .orig.tar.gz +worksrcdir ${name}-${version} +checksums md5 8590532f4702fa44027a6a583657c9ef +use_configure no +destroot.destdir DESTDIR=${destroot}${prefix} +destroot.args PREFIX= -- cgit v1.2.3 From 0e2af948ab640cd4865d41951c7b8c2a35437f59 Mon Sep 17 00:00:00 2001 From: Jameson Graef Rollins Date: Sat, 4 Apr 2009 23:37:15 -0700 Subject: macports: attempt at something that would 'patch' in the correct SYS..DIR variables --- packaging/macports/Makefile | 23 +++++++++++++++++++++++ packaging/macports/Portfile | 17 +++++++++++++++++ 2 files changed, 40 insertions(+) create mode 100644 packaging/macports/Makefile (limited to 'packaging/macports/Portfile') diff --git a/packaging/macports/Makefile b/packaging/macports/Makefile new file mode 100644 index 0000000..10d9547 --- /dev/null +++ b/packaging/macports/Makefile @@ -0,0 +1,23 @@ +# use proper system paths for MacPorts instead of Debian's: +post-patch: + @${REINPLACE_CMD} -e 's|/etc/monkeysphere|'$(SYSETCDIR)'|g' \ + ${WRKSRC}/src/share/defaultenv \ + ${WRKSRC}/src/transitions/0.23 \ + ${WRKSRC}/man/man1/monkeysphere.1 \ + ${WRKSRC}/man/man8/monkeysphere-authentication.8 \ + ${WRKSRC}/man/man8/monkeysphere-host.8 \ + ${WRKSRC}/etc/monkeysphere-authentication.conf + @${REINPLACE_CMD} -e 's|/var/lib/monkeysphere|'$(SYSDATADIR)'|g' \ + ${WRKSRC}/src/transitions/0.23 \ + ${WRKSRC}/man/man1/monkeysphere.1 \ + ${WRKSRC}/man/man8/monkeysphere-authentication.8 \ + ${WRKSRC}/man/man8/monkeysphere-host.8 \ + ${WRKSRC}/src/monkeysphere-host \ + ${WRKSRC}/src/monkeysphere-authentication \ + ${WRKSRC}/doc/getting-started-admin.mdwn + @${REINPLACE_CMD} -e 's|/usr/share/monkeysphere|'$(SYSSHAREDIR)'|g' \ + ${WRKSRC}/src/monkeysphere-host \ + ${WRKSRC}/src/monkeysphere-authentication \ + ${WRKSRC}/src/monkeysphere + # and clean up cruft from the sed replacements: + ${FIND} ${WRKSRC} -name '*.bak' -delete diff --git a/packaging/macports/Portfile b/packaging/macports/Portfile index 9680b4e..e6176d0 100644 --- a/packaging/macports/Portfile +++ b/packaging/macports/Portfile @@ -30,6 +30,23 @@ distname ${name}_${version} extract.suffix .orig.tar.gz worksrcdir ${name}-${version} checksums md5 8590532f4702fa44027a6a583657c9ef + +patch.dir ${worksrcpath} +patch.cmd make +patch.args -f Makefile \ + WRKSRC=${worksrcpath} \ + SYSETCDIR=${destroot}${prefix}/etc/monkeysphere \ + SYSDATADIR=${destroot}${prefix}/var/db/monkeysphere \ + SYSSHAREDIR=${destroot}${prefix}/share/monkeysphere \ + post-patch + use_configure no + destroot.destdir DESTDIR=${destroot}${prefix} destroot.args PREFIX= + +# variant to use the port version of bash, which may be much newer +# than the one provided by the system +variant port-bash description {use port version of Bash} { + depends_run-append port:bash +} -- cgit v1.2.3 From 1687f57fcfb41453539313d66b8b01bd073c4577 Mon Sep 17 00:00:00 2001 From: Jameson Graef Rollins Date: Sun, 5 Apr 2009 11:37:07 -0700 Subject: macports: better way to swap SYSDATADIR --- packaging/macports/Makefile | 23 ----------------------- packaging/macports/Portfile | 32 +++++++++++++++++++++++--------- 2 files changed, 23 insertions(+), 32 deletions(-) delete mode 100644 packaging/macports/Makefile (limited to 'packaging/macports/Portfile') diff --git a/packaging/macports/Makefile b/packaging/macports/Makefile deleted file mode 100644 index 10d9547..0000000 --- a/packaging/macports/Makefile +++ /dev/null @@ -1,23 +0,0 @@ -# use proper system paths for MacPorts instead of Debian's: -post-patch: - @${REINPLACE_CMD} -e 's|/etc/monkeysphere|'$(SYSETCDIR)'|g' \ - ${WRKSRC}/src/share/defaultenv \ - ${WRKSRC}/src/transitions/0.23 \ - ${WRKSRC}/man/man1/monkeysphere.1 \ - ${WRKSRC}/man/man8/monkeysphere-authentication.8 \ - ${WRKSRC}/man/man8/monkeysphere-host.8 \ - ${WRKSRC}/etc/monkeysphere-authentication.conf - @${REINPLACE_CMD} -e 's|/var/lib/monkeysphere|'$(SYSDATADIR)'|g' \ - ${WRKSRC}/src/transitions/0.23 \ - ${WRKSRC}/man/man1/monkeysphere.1 \ - ${WRKSRC}/man/man8/monkeysphere-authentication.8 \ - ${WRKSRC}/man/man8/monkeysphere-host.8 \ - ${WRKSRC}/src/monkeysphere-host \ - ${WRKSRC}/src/monkeysphere-authentication \ - ${WRKSRC}/doc/getting-started-admin.mdwn - @${REINPLACE_CMD} -e 's|/usr/share/monkeysphere|'$(SYSSHAREDIR)'|g' \ - ${WRKSRC}/src/monkeysphere-host \ - ${WRKSRC}/src/monkeysphere-authentication \ - ${WRKSRC}/src/monkeysphere - # and clean up cruft from the sed replacements: - ${FIND} ${WRKSRC} -name '*.bak' -delete diff --git a/packaging/macports/Portfile b/packaging/macports/Portfile index e6176d0..290edfd 100644 --- a/packaging/macports/Portfile +++ b/packaging/macports/Portfile @@ -31,17 +31,31 @@ extract.suffix .orig.tar.gz worksrcdir ${name}-${version} checksums md5 8590532f4702fa44027a6a583657c9ef -patch.dir ${worksrcpath} -patch.cmd make -patch.args -f Makefile \ - WRKSRC=${worksrcpath} \ - SYSETCDIR=${destroot}${prefix}/etc/monkeysphere \ - SYSDATADIR=${destroot}${prefix}/var/db/monkeysphere \ - SYSSHAREDIR=${destroot}${prefix}/share/monkeysphere \ - post-patch - use_configure no +post-build { + exec sed -i .tmp -e "s|/etc/monkeysphere|${prefix}/etc/monkeysphere|g" \ + ${worksrcpath}/src/share/defaultenv \ + ${worksrcpath}/src/transitions/0.23 \ + ${worksrcpath}/man/man1/monkeysphere.1 \ + ${worksrcpath}/man/man8/monkeysphere-authentication.8 \ + ${worksrcpath}/man/man8/monkeysphere-host.8 \ + ${worksrcpath}/etc/monkeysphere-authentication.conf + exec sed -i .tmp -e "s|/var/lib/monkeysphere|${prefix}/var/db/monkeysphere|g" \ + ${worksrcpath}/src/transitions/0.23 \ + ${worksrcpath}/man/man1/monkeysphere.1 \ + ${worksrcpath}/man/man8/monkeysphere-authentication.8 \ + ${worksrcpath}/man/man8/monkeysphere-host.8 \ + ${worksrcpath}/src/monkeysphere-host \ + ${worksrcpath}/src/monkeysphere-authentication \ + ${worksrcpath}/doc/getting-started-admin.mdwn + exec sed -i .tmp -e "s|/usr/share/monkeysphere|${prefix}/share/monkeysphere|g" \ + ${worksrcpath}/src/monkeysphere-host \ + ${worksrcpath}/src/monkeysphere-authentication \ + ${worksrcpath}/src/monkeysphere + exec find ${worksrcpath} -name *.tmp -delete +} + destroot.destdir DESTDIR=${destroot}${prefix} destroot.args PREFIX= -- cgit v1.2.3 From 6d274a5eadc7bcf543b87945472f910e2a6a67c7 Mon Sep 17 00:00:00 2001 From: Jameson Graef Rollins Date: Sun, 5 Apr 2009 19:40:33 -0700 Subject: macports: fix perl dependencies, and add socat dependency --- packaging/macports/Portfile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'packaging/macports/Portfile') diff --git a/packaging/macports/Portfile b/packaging/macports/Portfile index 290edfd..36c3635 100644 --- a/packaging/macports/Portfile +++ b/packaging/macports/Portfile @@ -21,9 +21,11 @@ platforms darwin depends_run bin:ssh:openssh \ port:gnupg \ port:perl5.10 \ - port:p5-crypt-rsa \ + port:p5-crypt-openssl-rsa \ + port:p5-crypt-openssl-bignum \ port:p5-digest-sha1 \ - port:procmail + port:procmail \ + port:socat master_sites http://archive.monkeysphere.info/debian/pool/monkeysphere/m/monkeysphere/ distname ${name}_${version} -- cgit v1.2.3 From cb31db06f2432e5701eb2478b1cffac9e7c168d4 Mon Sep 17 00:00:00 2001 From: Jameson Graef Rollins Date: Sun, 5 Apr 2009 23:54:07 -0700 Subject: macports: move to just perl5 dependency (which for now is 5.8). --- packaging/macports/Portfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packaging/macports/Portfile') diff --git a/packaging/macports/Portfile b/packaging/macports/Portfile index 36c3635..0c440b6 100644 --- a/packaging/macports/Portfile +++ b/packaging/macports/Portfile @@ -20,7 +20,7 @@ platforms darwin depends_run bin:ssh:openssh \ port:gnupg \ - port:perl5.10 \ + port:perl5 \ port:p5-crypt-openssl-rsa \ port:p5-crypt-openssl-bignum \ port:p5-digest-sha1 \ -- cgit v1.2.3 From 9c49dffef9a4802004cc1216559bf5847e68a16b Mon Sep 17 00:00:00 2001 From: Jameson Graef Rollins Date: Mon, 6 Apr 2009 19:53:56 -0700 Subject: macports: add a hook to replace the keytrans shebang line with one that use /usr/bin/env. this removes the -T taint checking option, so we need to make sure this is ok, but this is the only way to get keytrans to work with the correct macports version of perl --- packaging/macports/Portfile | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'packaging/macports/Portfile') diff --git a/packaging/macports/Portfile b/packaging/macports/Portfile index 0c440b6..7d87a93 100644 --- a/packaging/macports/Portfile +++ b/packaging/macports/Portfile @@ -36,6 +36,7 @@ checksums md5 8590532f4702fa44027a6a583657c9ef use_configure no post-build { + # update paths to SYS*DIRs exec sed -i .tmp -e "s|/etc/monkeysphere|${prefix}/etc/monkeysphere|g" \ ${worksrcpath}/src/share/defaultenv \ ${worksrcpath}/src/transitions/0.23 \ @@ -55,6 +56,12 @@ post-build { ${worksrcpath}/src/monkeysphere-host \ ${worksrcpath}/src/monkeysphere-authentication \ ${worksrcpath}/src/monkeysphere + + # fix perl shebang line + exec sed -i .tmp -e "s|#!/usr/bin/perl -T|#!/usr/bin/env perl|g" \ + ${worksrcpath}/src/share/keytrans + + # remove leftover sed cruft exec find ${worksrcpath} -name *.tmp -delete } -- cgit v1.2.3 From a258aafebeb35fec82eecc0bdf3a5d474301fb81 Mon Sep 17 00:00:00 2001 From: Jameson Graef Rollins Date: Mon, 6 Apr 2009 21:13:00 -0700 Subject: macports: improve perl shebang line modification for keytrans --- packaging/macports/Portfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'packaging/macports/Portfile') diff --git a/packaging/macports/Portfile b/packaging/macports/Portfile index 7d87a93..dd6d58b 100644 --- a/packaging/macports/Portfile +++ b/packaging/macports/Portfile @@ -57,8 +57,8 @@ post-build { ${worksrcpath}/src/monkeysphere-authentication \ ${worksrcpath}/src/monkeysphere - # fix perl shebang line - exec sed -i .tmp -e "s|#!/usr/bin/perl -T|#!/usr/bin/env perl|g" \ + # fix perl shebang line to point to macports perl install + exec sed -i .tmp -e "s|^#!/usr/bin/perl -T$|#!/opt/local/bin/perl -T|" \ ${worksrcpath}/src/share/keytrans # remove leftover sed cruft -- cgit v1.2.3 From 80d903a7cacc0c5c60adfb86067e7c348f83e4c2 Mon Sep 17 00:00:00 2001 From: Jameson Graef Rollins Date: Mon, 6 Apr 2009 21:36:31 -0700 Subject: macports: remove socat from the run depends, since it's not actually a run dependency. --- packaging/macports/Portfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'packaging/macports/Portfile') diff --git a/packaging/macports/Portfile b/packaging/macports/Portfile index dd6d58b..d73a656 100644 --- a/packaging/macports/Portfile +++ b/packaging/macports/Portfile @@ -24,8 +24,7 @@ depends_run bin:ssh:openssh \ port:p5-crypt-openssl-rsa \ port:p5-crypt-openssl-bignum \ port:p5-digest-sha1 \ - port:procmail \ - port:socat + port:procmail master_sites http://archive.monkeysphere.info/debian/pool/monkeysphere/m/monkeysphere/ distname ${name}_${version} -- cgit v1.2.3 From 436fa72417f0d086347bcaa7256d5f83296bc6d6 Mon Sep 17 00:00:00 2001 From: Jameson Graef Rollins Date: Mon, 6 Apr 2009 21:59:59 -0700 Subject: add new util script to update the macports Portfile --- packaging/macports/Portfile | 4 ++-- utils/build-macports-portfile | 9 +++++++++ 2 files changed, 11 insertions(+), 2 deletions(-) create mode 100755 utils/build-macports-portfile (limited to 'packaging/macports/Portfile') diff --git a/packaging/macports/Portfile b/packaging/macports/Portfile index d73a656..fd2eafe 100644 --- a/packaging/macports/Portfile +++ b/packaging/macports/Portfile @@ -3,7 +3,7 @@ PortSystem 1.0 name monkeysphere -version 0.24 +version 0.25 categories net security maintainers nomaintainer description use the OpenPGP web of trust to verify ssh connections @@ -30,7 +30,7 @@ master_sites http://archive.monkeysphere.info/debian/pool/monkeysphere/m/ distname ${name}_${version} extract.suffix .orig.tar.gz worksrcdir ${name}-${version} -checksums md5 8590532f4702fa44027a6a583657c9ef +checksums md5 3ac1918eee99725869e65f3f5a24fe17 use_configure no diff --git a/utils/build-macports-portfile b/utils/build-macports-portfile new file mode 100755 index 0000000..c5e6a48 --- /dev/null +++ b/utils/build-macports-portfile @@ -0,0 +1,9 @@ +#!/bin/bash -e + +PORTFILE="packaging/macports/Portfile" + +VERSION=`head -n1 packaging/debian/changelog | sed 's/.*(\([^-]*\)-.*/\1/'` +MD5=`md5sum monkeysphere_${VERSION}.orig.tar.gz | awk '{ print $1 }'` + +sed -i~ 's/^version.*$/version '"$VERSION"/ "$PORTFILE" +sed -i~ 's/^checksums.*$/checksums md5 '"$MD5"/ "$PORTFILE" -- cgit v1.2.3 From ba5ecb7a3f10b916369ae05c8a751c861915da1d Mon Sep 17 00:00:00 2001 From: Jameson Graef Rollins Date: Mon, 6 Apr 2009 22:06:29 -0700 Subject: revert macports back to state for 0.24, until 0.25 is actually released --- packaging/macports/Portfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'packaging/macports/Portfile') diff --git a/packaging/macports/Portfile b/packaging/macports/Portfile index fd2eafe..d73a656 100644 --- a/packaging/macports/Portfile +++ b/packaging/macports/Portfile @@ -3,7 +3,7 @@ PortSystem 1.0 name monkeysphere -version 0.25 +version 0.24 categories net security maintainers nomaintainer description use the OpenPGP web of trust to verify ssh connections @@ -30,7 +30,7 @@ master_sites http://archive.monkeysphere.info/debian/pool/monkeysphere/m/ distname ${name}_${version} extract.suffix .orig.tar.gz worksrcdir ${name}-${version} -checksums md5 3ac1918eee99725869e65f3f5a24fe17 +checksums md5 8590532f4702fa44027a6a583657c9ef use_configure no -- cgit v1.2.3