Wed Jul 29 13:59:59 2009 UTC ()
when switching to the "icecast" uid/gid, drop root's supplementary
group memberships,
bump PKGREVISION


(drochner)
diff -r1.47 -r1.48 pkgsrc/audio/icecast/Makefile
diff -r1.17 -r1.18 pkgsrc/audio/icecast/distinfo
diff -r0 -r1.1 pkgsrc/audio/icecast/patches/patch-ad
cvs diff -r1.47 -r1.48 pkgsrc/audio/icecast/Makefile (switch to unified diff)

--- pkgsrc/audio/icecast/Makefile 2008/11/08 21:13:27 1.47
+++ pkgsrc/audio/icecast/Makefile 2009/07/29 13:59:59 1.48
@@ -1,66 +1,66 @@ @@ -1,66 +1,66 @@
1# $NetBSD: Makefile,v 1.47 2008/11/08 21:13:27 bjs Exp $ 1# $NetBSD: Makefile,v 1.48 2009/07/29 13:59:59 drochner Exp $
2# 2#
3 3
4DISTNAME= icecast-2.3.2 4DISTNAME= icecast-2.3.2
5PKGREVISION= 1 5PKGREVISION= 2
6CATEGORIES= audio 6CATEGORIES= audio
7MASTER_SITES= http://downloads.xiph.org/releases/icecast/ 7MASTER_SITES= http://downloads.xiph.org/releases/icecast/
8 8
9MAINTAINER= kim@tac.nyc.ny.us 9MAINTAINER= kim@tac.nyc.ny.us
10HOMEPAGE= http://www.icecast.org/ 10HOMEPAGE= http://www.icecast.org/
11COMMENT= Live streaming audio server 11COMMENT= Live streaming audio server
12 12
13PKG_DESTDIR_SUPPORT= user-destdir 13PKG_DESTDIR_SUPPORT= user-destdir
14 14
15USE_PKGLOCALEDIR= yes 15USE_PKGLOCALEDIR= yes
16USE_LIBTOOL= yes 16USE_LIBTOOL= yes
17GNU_CONFIGURE= yes 17GNU_CONFIGURE= yes
18PTHREAD_AUTO_VARS= yes 18PTHREAD_AUTO_VARS= yes
19 19
20BUILD_DEFS+= ICECAST_CHROOTDIR 20BUILD_DEFS+= ICECAST_CHROOTDIR
21 21
22PKG_SYSCONFSUBDIR= icecast 22PKG_SYSCONFSUBDIR= icecast
23RCD_SCRIPTS= icecast 23RCD_SCRIPTS= icecast
24 24
25ICECAST_LOGDIR?= ${ICECAST_CHROOTDIR}/log 25ICECAST_LOGDIR?= ${ICECAST_CHROOTDIR}/log
26 26
27ICECAST_USER?= icecast 27ICECAST_USER?= icecast
28ICECAST_GROUP?= icecast 28ICECAST_GROUP?= icecast
29PKG_USERS_VARS+= ICECAST_USER 29PKG_USERS_VARS+= ICECAST_USER
30PKG_GROUPS_VARS+= ICECAST_GROUP 30PKG_GROUPS_VARS+= ICECAST_GROUP
31 31
32PKG_GROUPS= ${ICECAST_GROUP} 32PKG_GROUPS= ${ICECAST_GROUP}
33PKG_USERS= ${ICECAST_USER}:${ICECAST_GROUP} 33PKG_USERS= ${ICECAST_USER}:${ICECAST_GROUP}
34 34
35EGDIR= ${PREFIX}/share/examples/icecast 35EGDIR= ${PREFIX}/share/examples/icecast
36CONF_FILES= ${EGDIR}/icecast.xml ${PKG_SYSCONFDIR}/icecast.xml 36CONF_FILES= ${EGDIR}/icecast.xml ${PKG_SYSCONFDIR}/icecast.xml
37 37
38OWN_DIRS_PERMS= ${ICECAST_CHROOTDIR} ${ICECAST_USER} ${ICECAST_GROUP} 770 38OWN_DIRS_PERMS= ${ICECAST_CHROOTDIR} ${ICECAST_USER} ${ICECAST_GROUP} 770
39OWN_DIRS_PERMS+= ${ICECAST_LOGDIR} ${ICECAST_USER} ${ICECAST_GROUP} 770 39OWN_DIRS_PERMS+= ${ICECAST_LOGDIR} ${ICECAST_USER} ${ICECAST_GROUP} 770
40 40
41post-extract: 41post-extract:
42 ${MV} ${WRKSRC}/conf/icecast.xml.in ${WRKSRC}/conf/icecast.fixme 42 ${MV} ${WRKSRC}/conf/icecast.xml.in ${WRKSRC}/conf/icecast.fixme
43 43
44post-install: 44post-install:
45 ${SED} \ 45 ${SED} \
46 -e "s,@BASEDIR@,${ICECAST_CHROOTDIR},g" \ 46 -e "s,@BASEDIR@,${ICECAST_CHROOTDIR},g" \
47 -e "s,@LOGDIR@,log/,g" \ 47 -e "s,@LOGDIR@,log/,g" \
48 -e "s,@WEBROOT@,${PREFIX}/share/icecast/web,g" \ 48 -e "s,@WEBROOT@,${PREFIX}/share/icecast/web,g" \
49 -e "s,@ADMINROOT@,${PREFIX}/share/icecast/admin,g" \ 49 -e "s,@ADMINROOT@,${PREFIX}/share/icecast/admin,g" \
50 -e "s,@PIDDIR@,${ICECAST_CHROOTDIR},g" \ 50 -e "s,@PIDDIR@,${ICECAST_CHROOTDIR},g" \
51 -e "s,@ICECAST_USER@,${ICECAST_USER},g" \ 51 -e "s,@ICECAST_USER@,${ICECAST_USER},g" \
52 -e "s,@ICECAST_GROUP@,${ICECAST_GROUP},g" \ 52 -e "s,@ICECAST_GROUP@,${ICECAST_GROUP},g" \
53 ${WRKSRC}/conf/icecast.fixme > ${WRKSRC}/conf/icecast.xml 53 ${WRKSRC}/conf/icecast.fixme > ${WRKSRC}/conf/icecast.xml
54 ${INSTALL_DATA_DIR} ${DESTDIR}${EGDIR} 54 ${INSTALL_DATA_DIR} ${DESTDIR}${EGDIR}
55 ${INSTALL_DATA} ${WRKSRC}/conf/icecast.xml ${DESTDIR}${EGDIR} 55 ${INSTALL_DATA} ${WRKSRC}/conf/icecast.xml ${DESTDIR}${EGDIR}
56 56
57.include "../../audio/libvorbis/buildlink3.mk" 57.include "../../audio/libvorbis/buildlink3.mk"
58.include "../../audio/speex/buildlink3.mk" 58.include "../../audio/speex/buildlink3.mk"
59.include "../../converters/libiconv/buildlink3.mk" 59.include "../../converters/libiconv/buildlink3.mk"
60.include "../../multimedia/libtheora/buildlink3.mk" 60.include "../../multimedia/libtheora/buildlink3.mk"
61.include "../../textproc/libxml2/buildlink3.mk" 61.include "../../textproc/libxml2/buildlink3.mk"
62.include "../../textproc/libxslt/buildlink3.mk" 62.include "../../textproc/libxslt/buildlink3.mk"
63.include "../../www/curl/buildlink3.mk" 63.include "../../www/curl/buildlink3.mk"
64 64
65.include "../../mk/pthread.buildlink3.mk" 65.include "../../mk/pthread.buildlink3.mk"
66.include "../../mk/bsd.pkg.mk" 66.include "../../mk/bsd.pkg.mk"
cvs diff -r1.17 -r1.18 pkgsrc/audio/icecast/distinfo (switch to unified diff)

--- pkgsrc/audio/icecast/distinfo 2008/09/08 05:32:59 1.17
+++ pkgsrc/audio/icecast/distinfo 2009/07/29 13:59:59 1.18
@@ -1,8 +1,9 @@ @@ -1,8 +1,9 @@
1$NetBSD: distinfo,v 1.17 2008/09/08 05:32:59 dholland Exp $ 1$NetBSD: distinfo,v 1.18 2009/07/29 13:59:59 drochner Exp $
2 2
3SHA1 (icecast-2.3.2.tar.gz) = a52b13505548c2eff2c64aab95a42dcafda11227 3SHA1 (icecast-2.3.2.tar.gz) = a52b13505548c2eff2c64aab95a42dcafda11227
4RMD160 (icecast-2.3.2.tar.gz) = ec14553cce652fb80823316c9705f4cb6179cc2a 4RMD160 (icecast-2.3.2.tar.gz) = ec14553cce652fb80823316c9705f4cb6179cc2a
5Size (icecast-2.3.2.tar.gz) = 1152319 bytes 5Size (icecast-2.3.2.tar.gz) = 1152319 bytes
6SHA1 (patch-aa) = 2d85cabe25cf3860e42110eaf3fa5e2b1775e0cf 6SHA1 (patch-aa) = 2d85cabe25cf3860e42110eaf3fa5e2b1775e0cf
7SHA1 (patch-ab) = 3b9ecb2caf222f6c08646d856419595f3585f70b 7SHA1 (patch-ab) = 3b9ecb2caf222f6c08646d856419595f3585f70b
8SHA1 (patch-ac) = 5637f0cd10dc4b8d03e674b701bcb16f45339eaa 8SHA1 (patch-ac) = 5637f0cd10dc4b8d03e674b701bcb16f45339eaa
 9SHA1 (patch-ad) = 9b6388d99bae8239138689673dc26286323ae803
File Added: pkgsrc/audio/icecast/patches/Attic/patch-ad
$NetBSD: patch-ad,v 1.1 2009/07/29 13:59:59 drochner Exp $

--- src/main.c.orig	2008-04-23 07:18:53.000000000 +0200
+++ src/main.c
@@ -398,6 +398,10 @@ static void _ch_root_uid_setup(void)
                fprintf(stdout, "Changed groupid to %i.\n", (int)gid);
            else
                fprintf(stdout, "Error changing groupid: %s.\n", strerror(errno));
+	   if(!setgroups(1, &gid))
+	       fprintf(stdout, "Dropped root's group memberships.\n");
+	   else
+	       fprintf(stdout, "Error dropping group memberships.\n");
        }
 
        if(uid != -1) {