From 086b04277abc28a1237b7b8289065eb6197a2ab0 Mon Sep 17 00:00:00 2001 From: johans Date: Mon, 24 May 2010 10:48:39 +0000 Subject: - Update shishi to 1.0.0 - Update MASTER_SITE (GNU) - Remove custom patch (fixed upstream) - Note: shlib version bumped --- security/shishi/Makefile | 9 ++------- security/shishi/distinfo | 6 +++--- security/shishi/files/patch-lib_netio.c | 14 -------------- security/shishi/files/pkg-message.in | 3 +-- security/shishi/pkg-plist | 6 ++++-- 5 files changed, 10 insertions(+), 28 deletions(-) delete mode 100644 security/shishi/files/patch-lib_netio.c (limited to 'security') diff --git a/security/shishi/Makefile b/security/shishi/Makefile index b4c77499f861..6d41fa1de4fc 100644 --- a/security/shishi/Makefile +++ b/security/shishi/Makefile @@ -7,11 +7,9 @@ # PORTNAME= shishi -PORTVERSION= 0.0.43 -PORTREVISION= 1 +PORTVERSION= 1.0.0 CATEGORIES= security -MASTER_SITES= ${MASTER_SITE_GNU_ALPHA} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= GNU MAINTAINER= johans@FreeBSD.org COMMENT= A free implementation of the Kerberos 5 network security system @@ -64,7 +62,4 @@ post-patch: @${REINPLACE_CMD} -e 's:\.\./gl/libgnu.la:../db/gl/libgnu.la &:' \ ${WRKSRC}/src/Makefile.in -post-install: - @${CAT} ${PKGMESSAGE} - .include diff --git a/security/shishi/distinfo b/security/shishi/distinfo index f39156e173e1..1a20fa2006a0 100644 --- a/security/shishi/distinfo +++ b/security/shishi/distinfo @@ -1,3 +1,3 @@ -MD5 (shishi-0.0.43.tar.gz) = ee2e4d122d27c312c07d8ab6ec65da6e -SHA256 (shishi-0.0.43.tar.gz) = a0768907475867a9f7c6ec9152b6467f0de907895bc155b2d13cdf4d2725129e -SIZE (shishi-0.0.43.tar.gz) = 4250074 +MD5 (shishi-1.0.0.tar.gz) = e6536784d7181e6bcb848ee259dd56c7 +SHA256 (shishi-1.0.0.tar.gz) = 2f1e996649776514b63e46a069051d51b53dcd22fea191ce7618f3dbb45b12c9 +SIZE (shishi-1.0.0.tar.gz) = 4976544 diff --git a/security/shishi/files/patch-lib_netio.c b/security/shishi/files/patch-lib_netio.c deleted file mode 100644 index e722674c2a52..000000000000 --- a/security/shishi/files/patch-lib_netio.c +++ /dev/null @@ -1,14 +0,0 @@ ---- lib/netio.c.orig 2010-04-01 23:36:30.000000000 +0200 -+++ lib/netio.c 2010-04-01 23:36:37.000000000 +0200 -@@ -241,9 +241,11 @@ sendrecv_host (Shishi * handle, - { - if (transport == TCP) - rc = sendrecv_tcp (handle, ai, indata, inlen, outdata, outlen); -+#ifdef USE_STARTTLS - else if (transport == TLS) - rc = _shishi_sendrecv_tls (handle, ai, indata, inlen, - outdata, outlen); -+#endif - else - rc = sendrecv_udp (handle, ai, indata, inlen, outdata, outlen); - diff --git a/security/shishi/files/pkg-message.in b/security/shishi/files/pkg-message.in index a70c92fe1ffb..5d95ed023563 100644 --- a/security/shishi/files/pkg-message.in +++ b/security/shishi/files/pkg-message.in @@ -1,7 +1,6 @@ ================================================================= NOTE: To finish installing this port, you need to execute the -following commands: +following command: -# mkdir -m 0700 -p /var/shishi # %%PREFIX%%/bin/shisa -a > %%PREFIX%%/etc/shishi/shishi.keys ================================================================= diff --git a/security/shishi/pkg-plist b/security/shishi/pkg-plist index af8b5d589002..e863d257cf9f 100644 --- a/security/shishi/pkg-plist +++ b/security/shishi/pkg-plist @@ -13,11 +13,11 @@ include/shishi.h lib/libshisa.a lib/libshisa.la lib/libshisa.so -lib/libshisa.so.0 +lib/libshisa.so.1 lib/libshishi.a lib/libshishi.la lib/libshishi.so -lib/libshishi.so.0 +lib/libshishi.so.1 lib/security/pam_shishi.so lib/security/pam_shishi.la lib/security/pam_shishi.a @@ -33,3 +33,5 @@ libdata/pkgconfig/shishi.pc %%NLS%%@dirrmtry share/locale/en@quot @dirrmtry etc/shishi @dirrmtry lib/security +@exec mkdir -m 0700 -p /var/shishi +@dirrmtry /var/shishi -- cgit