diff options
| author | wennmach <wennmach> | 2001-04-12 14:53:39 +0000 |
|---|---|---|
| committer | wennmach <wennmach> | 2001-04-12 14:53:39 +0000 |
| commit | d72ba7a2b0a2bde678b5eafda7ad9e141663fa8d (patch) | |
| tree | 71ee481a361475ceb5e463a68e8b9ba5e7dc3e03 /security/kth-krb4 | |
| parent | af044625cd74b76c25dc7955430cb606c1902c57 (diff) | |
| download | pkgsrc-d72ba7a2b0a2bde678b5eafda7ad9e141663fa8d.tar.gz | |
Do not install man/man5/krb.equiv.5 to avoid a conflict with
cyrus-imapd. kth-krb4 thus no longer conflicts with cyrus-imapd.
Diffstat (limited to 'security/kth-krb4')
| -rw-r--r-- | security/kth-krb4/Makefile | 3 | ||||
| -rw-r--r-- | security/kth-krb4/files/patch-sum | 19 | ||||
| -rw-r--r-- | security/kth-krb4/patches/patch-ai | 16 | ||||
| -rw-r--r-- | security/kth-krb4/pkg/PLIST | 3 |
4 files changed, 28 insertions, 13 deletions
diff --git a/security/kth-krb4/Makefile b/security/kth-krb4/Makefile index af472b8f894..14c1f1055eb 100644 --- a/security/kth-krb4/Makefile +++ b/security/kth-krb4/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2001/03/29 21:17:40 wennmach Exp $ +# $NetBSD: Makefile,v 1.12 2001/04/12 14:53:39 wennmach Exp $ # DISTNAME= krb4-1.0.1 @@ -11,7 +11,6 @@ HOMEPAGE= http://www.pdc.kth.se/kth-krb/ COMMENT= Kerberos IV distribution from KTH CONFLICTS+= wu-ftpd-* -CONFLICTS+= cyrus-imapd-* CONFLICTS+= lukemftp-* CONFLICTS+= zephyr-* CONFLICTS+= libdes-* diff --git a/security/kth-krb4/files/patch-sum b/security/kth-krb4/files/patch-sum index 74f03d84745..11e50f99b31 100644 --- a/security/kth-krb4/files/patch-sum +++ b/security/kth-krb4/files/patch-sum @@ -1,10 +1,11 @@ -$NetBSD: patch-sum,v 1.3 2000/10/11 16:28:54 wennmach Exp $ +$NetBSD: patch-sum,v 1.4 2001/04/12 14:53:40 wennmach Exp $ -MD5 (patch-aa) = 232e0714e57e6905c6c51d913e0a3e94 -MD5 (patch-ab) = 6e48d45341db72c377b87e13963abe66 -MD5 (patch-ac) = d8b8f27ae12ae6d33271900b16b3fa38 -MD5 (patch-ad) = ec4cfc4ab1647a7e86c18b70f9a43eef -MD5 (patch-ae) = c021b58d8a564b70c86b1ba78d19c3ff -MD5 (patch-af) = 4ce752c342c54ad48243660a191776d1 -MD5 (patch-ag) = a443eab80ad7fd6d8172a0eaf3f1b18b -MD5 (patch-ah) = 6f8135d46c9b756bdc7205f168668b1c +SHA1 (patch-aa) = 2dd5ab6e8627c8e8ca59f647ccb2904bf50e0e2a +SHA1 (patch-ab) = 96182737812e3736d06c07c83210701c40aeddd5 +SHA1 (patch-ac) = be077919a4db794e271e50162914391c7a8cbf11 +SHA1 (patch-ad) = 40f3f488a2f27a4c76536bf2881f7141257872a0 +SHA1 (patch-ae) = 69786755e1f48be9c7c6fc579f63c36b42060af3 +SHA1 (patch-af) = 427fe2439f295d4a98560854335c48f1e0494b6d +SHA1 (patch-ag) = e39c3159fe89cedbb34dd5dadcb95826cd8d4576 +SHA1 (patch-ah) = 95cbf045bf327ebcff920b9416a9f0eba04cb5ca +SHA1 (patch-ai) = 5082b47d658a94f27cbfefd79391a48cb11c2ec1 diff --git a/security/kth-krb4/patches/patch-ai b/security/kth-krb4/patches/patch-ai new file mode 100644 index 00000000000..b00c0d14c72 --- /dev/null +++ b/security/kth-krb4/patches/patch-ai @@ -0,0 +1,16 @@ +$NetBSD: patch-ai,v 1.1 2001/04/12 14:53:40 wennmach Exp $ + +Do not install man/man5/krb.equiv.5 to avoid a conflict with the +cyrus-imapd package. + +--- man/Makefile.in.orig Thu Apr 12 16:23:12 2001 ++++ man/Makefile.in Thu Apr 12 16:23:51 2001 +@@ -55,7 +55,7 @@ + + # getusershell.cat3 + +-MAN5 = ftpusers.5 krb.conf.5 krb.equiv.5 krb.extra.5 \ ++MAN5 = ftpusers.5 krb.conf.5 krb.extra.5 \ + krb.realms.5 login.access.5 + + CAT5 = ftpusers.cat5 krb.conf.cat5 krb.equiv.cat5 \ diff --git a/security/kth-krb4/pkg/PLIST b/security/kth-krb4/pkg/PLIST index 8b4bcfb9237..c41ba33fa34 100644 --- a/security/kth-krb4/pkg/PLIST +++ b/security/kth-krb4/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.2 2000/10/11 16:28:54 wennmach Exp $ +@comment $NetBSD: PLIST,v 1.3 2001/04/12 14:53:40 wennmach Exp $ share/examples/kth-krb4/inetd.conf.changes share/examples/kth-krb4/krb.conf share/examples/kth-krb4/krb.realms @@ -124,7 +124,6 @@ man/man3/tf_util.3 man/man3/editline.3 man/man5/ftpusers.5 man/man5/krb.conf.5 -man/man5/krb.equiv.5 man/man5/krb.extra.5 man/man5/krb.realms.5 man/man5/login.access.5 |