From 836b1485e40961211446dbbd54251343cee6d61b Mon Sep 17 00:00:00 2001 From: fgsch Date: Tue, 6 Mar 2001 06:52:40 +0000 Subject: [PATCH] Remove icepass; use encrypt(1) instead. Regen patches and bump version. --- net/icecast/Makefile | 7 +-- net/icecast/files/icepass.c | 51 ------------------- net/icecast/patches/patch-configure | 9 ++-- net/icecast/patches/patch-src_Makefile.in | 24 --------- ...atch-src_utility.c => patch-src_utility_c} | 9 ++-- net/icecast/pkg/PLIST | 4 +- 6 files changed, 12 insertions(+), 92 deletions(-) delete mode 100644 net/icecast/files/icepass.c delete mode 100644 net/icecast/patches/patch-src_Makefile.in rename net/icecast/patches/{patch-src_utility.c => patch-src_utility_c} (72%) diff --git a/net/icecast/Makefile b/net/icecast/Makefile index 64074d05628..057567ad1f2 100644 --- a/net/icecast/Makefile +++ b/net/icecast/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.8 2000/10/16 13:30:33 fgsch Exp $ +# $OpenBSD: Makefile,v 1.9 2001/03/06 06:52:40 fgsch Exp $ .if ${MACHINE_ARCH} == "sparc" BROKEN= "pthreads are currently not working on the SPARC architecture" @@ -6,7 +6,7 @@ BROKEN= "pthreads are currently not working on the SPARC architecture" DISTNAME= icecast-1.3.7 CATEGORIES= net audio www -NEED_VERSION= 1.324 +NEED_VERSION= 1.358 MASTER_SITES= http://www.icecast.org/releases/ HOMEPAGE= http://www.icecast.org/ @@ -24,9 +24,6 @@ CONFIGURE_ARGS= --with-crypt --with-libwrap DOCS= AUTHORS BUGS CHANGES COPYING FAQ README -post-patch: - @cp ${FILESDIR}/icepass.c ${WRKSRC}/src - post-install: cd ${WRKSRC}; ${INSTALL_DATA} ${DOCS} ${PREFIX}/share/doc/icecast diff --git a/net/icecast/files/icepass.c b/net/icecast/files/icepass.c deleted file mode 100644 index 1ef808cc82e..00000000000 --- a/net/icecast/files/icepass.c +++ /dev/null @@ -1,51 +0,0 @@ -/* $OpenBSD: icepass.c,v 1.1 2000/08/29 03:40:36 fgsch Exp $ */ - -/* - * Create an encrypted password to use in icecast.conf, users.aut and - * command line when running the icecast server. - * The encription algorithm is blowfish, with 8 rounds by default. - * - * The number of rounds might be specified in command line. - * - * Tue Aug 29 00:06:28 ART 2000, -fgsch - */ - -#include -#include -#include -#include -#include - -int -main(argc, argv) - int argc; - char **argv; -{ - char *p, salt[_PASSWORD_LEN]; - int rounds = 8; - - if (argc > 1) { - char *ep; - - if (!strcmp(argv[1], "-h")) { - fprintf(stderr, "usage: icepass [rounds]\n"); - exit (1); - } - - rounds = strtol(argv[1], &ep, 10); - if (argv[1] == '\0' || *ep != '\0' || rounds < 4) - rounds = 4; - } - - strncpy(salt, bcrypt_gensalt(rounds), _PASSWORD_LEN - 1); - salt[_PASSWORD_LEN - 1] = 0; - - p = crypt(getpass("Password:"), salt); - if (p) - printf("Encrypted password: %s\n", p); - else - printf("Error encrypting password\n"); - - return (0); -} - diff --git a/net/icecast/patches/patch-configure b/net/icecast/patches/patch-configure index 7205c8cd467..a815fae820b 100644 --- a/net/icecast/patches/patch-configure +++ b/net/icecast/patches/patch-configure @@ -1,8 +1,7 @@ -$OpenBSD: patch-configure,v 1.3 2000/09/13 09:36:40 fgsch Exp $ - ---- configure.orig Wed Jul 5 16:22:53 2000 -+++ configure Tue Aug 29 00:10:33 2000 -@@ -879,16 +879,16 @@ +$OpenBSD: patch-configure,v 1.4 2001/03/06 06:52:41 fgsch Exp $ +--- configure.orig Wed Jul 5 17:22:53 2000 ++++ configure Tue Mar 6 03:23:41 2001 +@@ -879,16 +879,16 @@ if test "x$enable_fsstd" = "xyes"; then else ICECAST_BINDIR=${prefix}/bin ICECAST_SBINDIR=${prefix}/bin diff --git a/net/icecast/patches/patch-src_Makefile.in b/net/icecast/patches/patch-src_Makefile.in deleted file mode 100644 index b741e969546..00000000000 --- a/net/icecast/patches/patch-src_Makefile.in +++ /dev/null @@ -1,24 +0,0 @@ -$OpenBSD: patch-src_Makefile.in,v 1.1 2000/08/29 04:36:33 brad Exp $ - ---- src/Makefile.in.orig Wed Jul 5 17:44:54 2000 -+++ src/Makefile.in Tue Aug 29 00:12:50 2000 -@@ -83,7 +83,7 @@ - - SUBDIRS = authenticate - --bin_PROGRAMS = icecast -+bin_PROGRAMS = icecast icepass - - noinst_HEADERS = admin.h alias.h avl.h avl_functions.h client.h definitions.h commandline.h commands.h connection.h dir.h directory.h globals.h http.h ice_string.h icecast.h icetypes.h log.h logtime.h main.h match.h memory.h relay.h restrict.h sock.h source.h static.h threads.h timer.h utility.h vars.h ice_resolv.h item.h pool.h interpreter.h - -@@ -187,6 +187,10 @@ - icecast: $(icecast_OBJECTS) $(icecast_DEPENDENCIES) - @rm -f icecast - $(LINK) $(icecast_LDFLAGS) $(icecast_OBJECTS) $(icecast_LDADD) $(LIBS) -+ -+icepass: icepass.o -+ @rm -f icepass -+ $(LINK) icepass.o - - # This directory's subdirectories are mostly independent; you can cd - # into them and run `make' without going through this Makefile. diff --git a/net/icecast/patches/patch-src_utility.c b/net/icecast/patches/patch-src_utility_c similarity index 72% rename from net/icecast/patches/patch-src_utility.c rename to net/icecast/patches/patch-src_utility_c index cfed9dfb5da..949d39112b3 100644 --- a/net/icecast/patches/patch-src_utility.c +++ b/net/icecast/patches/patch-src_utility_c @@ -1,8 +1,7 @@ -$OpenBSD: patch-src_utility.c,v 1.1 2000/08/29 04:36:33 brad Exp $ - +$OpenBSD: patch-src_utility_c,v 1.1 2001/03/06 06:52:42 fgsch Exp $ --- src/utility.c.orig Wed Jul 5 16:52:40 2000 -+++ src/utility.c Mon Aug 28 23:06:20 2000 -@@ -102,7 +102,6 @@ ++++ src/utility.c Tue Mar 6 03:23:41 2001 +@@ -102,7 +102,6 @@ int password_match(const char *crypted, return 0; #else @@ -10,7 +9,7 @@ $OpenBSD: patch-src_utility.c,v 1.1 2000/08/29 04:36:33 brad Exp $ char *test_crypted; extern char *crypt(const char *, const char *); -@@ -111,18 +110,8 @@ +@@ -111,18 +110,8 @@ int password_match(const char *crypted, return 0; } diff --git a/net/icecast/pkg/PLIST b/net/icecast/pkg/PLIST index a6e4519cacc..808d4cd00d4 100644 --- a/net/icecast/pkg/PLIST +++ b/net/icecast/pkg/PLIST @@ -1,6 +1,5 @@ -@comment $OpenBSD: PLIST,v 1.2 2000/08/29 03:40:36 fgsch Exp $ +@comment $OpenBSD: PLIST,v 1.3 2001/03/06 06:52:43 fgsch Exp $ bin/icecast -bin/icepass share/doc/icecast/AUTHORS share/doc/icecast/BUGS share/doc/icecast/CHANGES @@ -30,6 +29,7 @@ share/icecast/templates/list_directory.html share/icecast/templates/mountlist.html share/icecast/templates/statistics.html @dirrm share/icecast/templates +@dirrm share/icecast/static @dirrm share/icecast @dirrm share/examples/icecast @dirrm share/doc/icecast