Date: Thu, 23 May 2002 20:18:43 +0200 (CEST) From: Oliver Lehmann <lehmann@ans-netz.de> To: FreeBSD-gnats-submit@FreeBSD.org Cc: Oliver Lehmann <lehmann@ans-netz.de> Subject: ports/38463: update-port: sysutils/xcdroast Message-ID: <200205231818.g4NIIhR39261@kartoffel.salatschuessel.net>
next in thread | raw e-mail | index | archive | help
>Number: 38463 >Category: ports >Synopsis: update-port: sysutils/xcdroast >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Thu May 23 11:20:01 PDT 2002 >Closed-Date: >Last-Modified: >Originator: Oliver Lehmann >Release: FreeBSD 4.5-STABLE i386 >Organization: >Environment: System: FreeBSD kartoffel.salatschuessel.net 4.5-STABLE FreeBSD 4.5-STABLE #0: Sun Feb 10 22:28:35 CET 2002 olivleh1@bert.sesamestreet.net:/usr/obj/i386/usr/src/sys/SINA i386 >Description: Please close ports/38185, and take these PR. I didn't took care about PREFIX and LOCALBASE inside the patches. >How-To-Repeat: >Fix: diff -ruN xcdroast.old/Makefile /usr/ports/sysutils/xcdroast/Makefile --- xcdroast.old/Makefile Fri Aug 31 01:15:47 2001 +++ /usr/ports/sysutils/xcdroast/Makefile Fri May 17 17:34:40 2002 @@ -6,10 +6,10 @@ # PORTNAME= xcdroast -PORTVERSION= 0.98.a.9 +PORTVERSION= 0.98.a.10 CATEGORIES= sysutils MASTER_SITES= http://www.xcdroast.org/download/ -DISTNAME= ${PORTNAME}-0.98alpha9 +DISTNAME= ${PORTNAME}-0.98alpha10 MAINTAINER= lehmann@ans-netz.de @@ -22,6 +22,7 @@ USE_IMLIB= yes MAKE_ENV+= GTK_CONFIG="${GTK_CONFIG}" \ + GLIB_CONFIG="${GLIB_CONFIG}" \ IMLIB_CONFIG="${IMLIB_CONFIG}" post-patch: @@ -29,31 +30,11 @@ ${PERL} -pi -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/$$i ; \ done - for i in Makefile ; do \ + for i in Makefile xcdroast.h ; do \ ${PERL} -pi -e "s|%%LOCALBASE%%|${LOCALBASE}|g" ${WRKSRC}/$$i ; \ done post-install: @${CAT} ${PKGMESSAGE} - -enable-nonroot: - - /usr/sbin/pw groupadd -n cdwrite - - for i in cdrecord cdda2wav mkisofs readcd; do \ - ${CHOWN} root:cdwrite ${LOCALBASE}/bin/$$i ; \ - ${CHMOD} 4710 ${LOCALBASE}/bin/$$i ; \ - done - - ${CHOWN} root:cdwrite ${PREFIX}/lib/xcdroast-0.98/bin/xcdrwrap - ${CHMOD} 2755 ${PREFIX}/lib/xcdroast-0.98/bin/xcdrwrap - - @${ECHO} "" - @${ECHO} "***************************************************************" - @${ECHO} " The first time root have to start xcdroast, to create the" - @${ECHO} " root-configuration-file ${PREFIX}/etc/xcdroast.conf. Without" - @${ECHO} " this file, a normal user will get an error message." - @${ECHO} "***************************************************************" - @${ECHO} "" .include <bsd.port.mk> diff -ruN xcdroast.old/distinfo /usr/ports/sysutils/xcdroast/distinfo --- xcdroast.old/distinfo Tue Aug 14 22:12:44 2001 +++ /usr/ports/sysutils/xcdroast/distinfo Fri May 17 17:34:27 2002 @@ -1 +1 @@ -MD5 (xcdroast-0.98alpha9.tar.gz) = 543d3237e7109572f5fcb6bdc6cf3e44 +MD5 (xcdroast-0.98alpha10.tar.gz) = 6f9ffd30c7ba8f067c2f1bddcc83d7d8 diff -ruN xcdroast.old/files/patch-Makefile /usr/ports/sysutils/xcdroast/files/patch-Makefile --- xcdroast.old/files/patch-Makefile Tue Aug 21 21:50:01 2001 +++ /usr/ports/sysutils/xcdroast/files/patch-Makefile Fri May 17 16:32:38 2002 @@ -1,5 +1,5 @@ ---- Makefile.orig Tue Jul 17 23:46:26 2001 -+++ Makefile Tue Aug 21 13:07:40 2001 +--- Makefile.orig Tue Apr 23 21:23:10 2002 ++++ Makefile Fri May 17 16:32:22 2002 @@ -6,13 +6,13 @@ # Installation prefix directory: @@ -16,18 +16,19 @@ # for linux INSTALL=/usr/bin/install -c -@@ -23,10 +23,10 @@ +@@ -29,11 +29,11 @@ #--- --CFLAGS=-Wall `gtk-config --cflags` `imlib-config --cflags` -DPRE_PREFIX="\"$(PREFIX)\"" -DPRE_LIBDIR="\"$(PRE_LIBDIR)\"" -DCDRTOOLS_PREFIX="\"$(CDRTOOLS_PREFIX)\"" --CFLAGS2=-Wall `glib-config --cflags --libs` -DPRE_PREFIX="\"$(PREFIX)\"" -DPRE_LIBDIR="\"$(PRE_LIBDIR)\"" -DCDRTOOLS_PREFIX="\"$(CDRTOOLS_PREFIX)\"" --LIBS=`gtk-config --libs` `imlib-config --libs` -lgdk_imlib +-CFLAGS=-Wall `gtk-config --cflags` `gdk-pixbuf-config --cflags` -DPRE_PREFIX="\"$(PREFIX)\"" -DPRE_LIBDIR="\"$(PRE_LIBDIR)\"" -DCDRTOOLS_PREFIX="\"$(CDRTOOLS_PREFIX)\"" $(EXTRA_CFLAGS) +-CFLAGS2=-Wall `glib-config --cflags --libs` -DPRE_PREFIX="\"$(PREFIX)\"" -DPRE_LIBDIR="\"$(PRE_LIBDIR)\"" -DCDRTOOLS_PREFIX="\"$(CDRTOOLS_PREFIX)\"" $(EXTRA_CFLAGS) ++CFLAGS=-Wall `${GTK_CONFIG} --cflags` `gdk-pixbuf-config --cflags` -DPRE_PREFIX="\"$(PREFIX)\"" -DPRE_LIBDIR="\"$(PRE_LIBDIR)\"" -DCDRTOOLS_PREFIX="\"$(CDRTOOLS_PREFIX)\"" $(EXTRA_CFLAGS) ++CFLAGS2=-Wall `${GLIB_CONFIG} --cflags --libs` -DPRE_PREFIX="\"$(PREFIX)\"" -DPRE_LIBDIR="\"$(PRE_LIBDIR)\"" -DCDRTOOLS_PREFIX="\"$(CDRTOOLS_PREFIX)\"" $(EXTRA_CFLAGS) + +-LIBS=`gtk-config --libs` `gdk-pixbuf-config --libs` -TOOLLIBS=`gtk-config --libs` -+CFLAGS=-Wall `${GTK_CONFIG} --cflags` `${IMLIB_CONFIG} --cflags` -DPRE_PREFIX="\"$(PREFIX)\"" -DPRE_LIBDIR="\"$(PRE_LIBDIR)\"" -DCDRTOOLS_PREFIX="\"$(CDRTOOLS_PREFIX)\"" -+CFLAGS2=-Wall `${GTK_CONFIG} --cflags --libs` -DPRE_PREFIX="\"$(PREFIX)\"" -DPRE_LIBDIR="\"$(PRE_LIBDIR)\"" -DCDRTOOLS_PREFIX="\"$(CDRTOOLS_PREFIX)\"" -+LIBS=`${GTK_CONFIG} --libs` `${IMLIB_CONFIG} --libs` -lgdk_imlib ++LIBS=`${GTK_CONFIG} --libs` `gdk-pixbuf-config --libs` +TOOLLIBS=`${GTK_CONFIG} --libs` - CC=gcc + CC=cc OBJ = main.o language.o init.o tools.o xtools.o menus.o setup.o io.o duplicate.o wav_frontend.o wav_id.o create.o diff -ruN xcdroast.old/files/patch-io.c /usr/ports/sysutils/xcdroast/files/patch-io.c --- xcdroast.old/files/patch-io.c Thu Jan 1 01:00:00 1970 +++ /usr/ports/sysutils/xcdroast/files/patch-io.c Fri May 17 17:13:01 2002 @@ -0,0 +1,12 @@ +--- io.c.orig Fri May 17 17:12:28 2002 ++++ io.c Fri May 17 17:12:44 2002 +@@ -8492,7 +8492,8 @@ + return 1; + } else { + /* create command to create new group */ +- g_snprintf(tmp,MAXLINE,"%s %s\n", GROUPADD, NONROOTMODEGROUP); ++ ++ g_snprintf(tmp,MAXLINE,"%s groupadd -n %s\n", GROUPADD, NONROOTMODEGROUP); + strcat(ret,tmp); + } + } diff -ruN xcdroast.old/files/patch-xcdrdata.h /usr/ports/sysutils/xcdroast/files/patch-xcdrdata.h --- xcdroast.old/files/patch-xcdrdata.h Thu Jan 1 01:00:00 1970 +++ /usr/ports/sysutils/xcdroast/files/patch-xcdrdata.h Fri May 17 16:41:15 2002 @@ -0,0 +1,10 @@ +--- xcdrdata.h.orig Fri May 17 16:40:55 2002 ++++ xcdrdata.h Fri May 17 16:40:30 2002 +@@ -3,6 +3,7 @@ + */ + + #include <time.h> ++#include <sys/types.h> + + typedef struct setup_data { + gint writer_devnr; diff -ruN xcdroast.old/files/patch-xcdroast.h /usr/ports/sysutils/xcdroast/files/patch-xcdroast.h --- xcdroast.old/files/patch-xcdroast.h Wed Aug 15 04:10:15 2001 +++ /usr/ports/sysutils/xcdroast/files/patch-xcdroast.h Thu May 23 20:14:40 2002 @@ -1,7 +1,46 @@ ---- xcdroast.h.orig Tue Aug 14 00:15:43 2001 -+++ xcdroast.h Tue Aug 14 00:46:08 2001 -@@ -89,14 +89,14 @@ - #define SAVEMASTERTRACK "mkisofs.out" +--- xcdroast.h.orig Tue Apr 23 20:55:27 2002 ++++ xcdroast.h Fri May 17 17:19:29 2002 +@@ -41,12 +41,12 @@ + #define UNAME "/bin/uname -a" + #define UNAME2 "/usr/bin/uname -a" + #define CHOWN "/bin/chown" +-#define CHOWN2 "/usr/bin/chown" ++#define CHOWN2 "/usr/sbin/chown" + #define CHGRP "/bin/chgrp" + #define CHGRP2 "/usr/bin/chgrp" + #define CHMOD "/bin/chmod" + #define CHMOD2 "/usr/bin/chmod" +-#define GROUPADD "/usr/sbin/groupadd" ++#define GROUPADD "/usr/sbin/pw" + + #define WAVPLAY "bin/wavplay" + #define RMTOOL "bin/rmtool" +@@ -59,10 +59,10 @@ + then in $PREFIX (e.g. /usr/bin/cdrecord instead of + /usr/local/lib/xcdroast-0.98/bin/cdrecord) */ + +-#define CDRECORD "bin/cdrecord" +-#define CDDA2WAV "bin/cdda2wav" +-#define READCD "bin/readcd" +-#define MKISOFS "bin/mkisofs" ++#define CDRECORD "%%LOCALBASE%%/bin/cdrecord" ++#define CDDA2WAV "%%LOCALBASE%%/bin/cdda2wav" ++#define READCD "%%LOCALBASE%%/bin/readcd" ++#define MKISOFS "%%LOCALBASE%%/bin/mkisofs" + + /* MINIMUM required versions. Greater versions are now silently + accepted. +@@ -70,7 +70,7 @@ + IT WONT WORK WITH LOWER VERSIONS, EVEN WHEN YOU THINK IT DOES! */ + + #define CDRECORD_VERSION "1.11a19" +-#define MKISOFS_VERSION "1.15a17" ++#define MKISOFS_VERSION "1.15a21" + #define CDDA2WAV_VERSION "1.11a19" + #define READCD_VERSION "1.11a19" + +@@ -116,14 +116,14 @@ + #define SAVEMASTERLIST "xcdrmaster.lst" /* default paths/configfile */ -#define PREFIX "/usr/local" @@ -14,6 +53,6 @@ #define ISOHEADERFILE "isoheader.cfg" -#define ROOTCONFIG "/etc/xcdroast.conf" +#define ROOTCONFIG "%%PREFIX%%/etc/xcdroast.conf" + #define NONROOTBAK "nonrootflags.cfg" /* language stuff*/ - #define MAXENTRIES 512 diff -ruN xcdroast.old/pkg-message /usr/ports/sysutils/xcdroast/pkg-message --- xcdroast.old/pkg-message Fri Aug 31 01:15:47 2001 +++ /usr/ports/sysutils/xcdroast/pkg-message Fri May 17 17:35:32 2002 @@ -2,7 +2,7 @@ ATTENTION! You must be root to use xcdroast. To use it as normal user, -type "make enable-nonroot" in the ports' directory. +click "enable-nonroot" after starting it at first as root. But beware! This is a security risk! It modifies the following files and gives them the set-user-ID-on-execution bit: @@ -12,7 +12,7 @@ cdda2wav(1) mkisofs(8) -All members of group "cdwrite" are able to run these files +All members of group "xcdwrite" are able to run these files as root. Usually, these group has no members. ************************************************************ diff -ruN xcdroast.old/pkg-plist /usr/ports/sysutils/xcdroast/pkg-plist --- xcdroast.old/pkg-plist Tue Aug 21 21:50:01 2001 +++ /usr/ports/sysutils/xcdroast/pkg-plist Fri May 17 17:48:26 2002 @@ -1,4 +1,13 @@ bin/xcdroast +lib/xcdroast-0.98/bin/cdda2wav +lib/xcdroast-0.98/bin/cddbtool +lib/xcdroast-0.98/bin/cdrecord +lib/xcdroast-0.98/bin/mkisofs +lib/xcdroast-0.98/bin/readcd +lib/xcdroast-0.98/bin/rmtool +lib/xcdroast-0.98/bin/vrfytool +lib/xcdroast-0.98/bin/wavplay +lib/xcdroast-0.98/bin/xcdrwrap lib/xcdroast-0.98/icons/burnproof.gif lib/xcdroast-0.98/icons/cddblogo.gif lib/xcdroast-0.98/icons/dialog_default.png @@ -6,19 +15,16 @@ lib/xcdroast-0.98/icons/dialog_information.png lib/xcdroast-0.98/icons/dialog_question.png lib/xcdroast-0.98/icons/dialog_warning.png +lib/xcdroast-0.98/icons/xcdricon.gif lib/xcdroast-0.98/icons/xcdrlogo.gif +lib/xcdroast-0.98/icons/xcdrlogo2.gif lib/xcdroast-0.98/lang/lang_extract.sh lib/xcdroast-0.98/lang/langhelp.def lib/xcdroast-0.98/lang/language.def lib/xcdroast-0.98/sound/test.wav -lib/xcdroast-0.98/bin/cddbtool -lib/xcdroast-0.98/bin/rmtool -lib/xcdroast-0.98/bin/vrfytool -lib/xcdroast-0.98/bin/wavplay -lib/xcdroast-0.98/bin/xcdrwrap @dirrm lib/xcdroast-0.98/bin @dirrm lib/xcdroast-0.98/icons @dirrm lib/xcdroast-0.98/lang @dirrm lib/xcdroast-0.98/sound @dirrm lib/xcdroast-0.98 -@unexec /usr/sbin/pw groupdel -n cdwrite +@unexec /usr/sbin/pw groupdel -n xcdwrite >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200205231818.g4NIIhR39261>