Date: Sat, 16 Mar 2002 11:42:01 +0900 From: Kazutoshi Kubota <tu7k-kbt@asahi-net.or.jp> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/35945: sysutils/webmin is not LOCALBASE clean Message-ID: <86d6y58c92.wl@marlone.asahi-net.or.jp>
next in thread | raw e-mail | index | archive | help
>Number: 35945
>Category: ports
>Synopsis: sysutils/webmin is not LOCALBASE clean
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: sw-bug
>Submitter-Id: current-users
>Arrival-Date: Fri Mar 15 18:50:01 PST 2002
>Closed-Date:
>Last-Modified:
>Originator: Kazutoshi Kubota
>Release: FreeBSD 4.5-RELEASE i386
>Organization:
CBUG - Tokyo west area BSD Users Group
>Environment:
System: FreeBSD flea.willbe6.org 4.5-RELEASE FreeBSD 4.5-RELEASE #0: Thu Jan 31 06:58:15 GMT 2002 root@flea.willbe6.org:/usr/obj/usr/src/sys/AVENTURE i386
>Description:
Some modules are hard coded paths. Current Makefile handles some
LOCALBASE issue, but not enough.
>How-To-Repeat:
>Fix:
diff -urN webmin.orig/Makefile webmin/Makefile
--- webmin.orig/Makefile Fri Mar 15 08:51:37 2002
+++ webmin/Makefile Sat Mar 16 10:07:42 2002
@@ -47,19 +47,14 @@
${WRKDIR}/webmin-${PORTVERSION}/bind8/config-freebsd-3.3
@${CP} ${WRKDIR}/webmin-${PORTVERSION}/bind8/config-freebsd-3.0 \
${WRKDIR}/webmin-${PORTVERSION}/bind8/config-freebsd-3.4
- @${CP} ${WRKSRC}/postfix/config ${WRKSRC}/postfix/config.sed
- @${SED} -e "s@/usr/sbin/postfix@${LOCALBASE}/sbin/postfix@" \
- -e "s@/usr/sbin/postconf@${LOCALBASE}/sbin/postconf@" \
- -e "s@/etc/postfix/main.cf@${LOCALBASE}/etc/postfix/main.cf@" \
- -e "s@/usr/sbin/postalias@${LOCALBASE}/sbin/postalias@" \
- -e "s@/usr/sbin/postmap@${LOCALBASE}/sbin/postmap@" \
- ${WRKSRC}/postfix/config.sed > ${WRKSRC}/postfix/config
- @${RM} ${WRKSRC}/postfix/config.sed
-
- @${CP} ${WRKSRC}/dhcpd/config-freebsd ${WRKSRC}/dhcpd/config-freebsd.sed
- @${SED} -e "s@^dhcpd_conf=.*@dhcpd_conf=${LOCALBASE}/etc/dhcpd.conf@" \
- ${WRKSRC}/dhcpd/config-freebsd.sed > ${WRKSRC}/dhcpd/config-freebsd
- @${RM} ${WRKSRC}/dhcpd/config-freebsd.sed
+.for file in config-freebsd apache/config-freebsd bind8/config-freebsd-2.1 \
+ bind8/config-freebsd-2.2 dhcpd/config-freebsd majordomo/config \
+ mysql/config-freebsd postfix/config-freebsd \
+ postgresql/config-freebsd proftpd/config-freebsd \
+ samba/config-freebsd squid/config-freebsd stunnel/config \
+ wuftpd/config-freebsd xinetd/config-freebsd
+ @${PERL} -pi -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/${file}
+.endfor
do-install:
@${MKDIR} ${PREFIX}/lib/webmin
diff -urN webmin.orig/files/patch-apache webmin/files/patch-apache
--- webmin.orig/files/patch-apache Thu Jan 1 09:00:00 1970
+++ webmin/files/patch-apache Sat Mar 16 10:00:44 2002
@@ -0,0 +1,21 @@
+--- apache/config-freebsd.orig Sat Mar 16 06:33:19 2002
++++ apache/config-freebsd Sat Mar 16 06:33:52 2002
+@@ -1,11 +1,11 @@
+ show_list=0
+-httpd_dir=/usr/local/etc/apache
+-httpd_path=/usr/local/sbin/httpd
+-apachectl_path=/usr/local/sbin/apachectl
+-httpd_conf=/usr/local/etc/apache/httpd.conf
+-mime_types=/usr/local/etc/apache/mime.types
+-srm_conf=/usr/local/etc/apache/srm.conf
+-access_conf=/usr/local/etc/apache/access.conf
++httpd_dir=%%PREFIX%%/etc/apache
++httpd_path=%%PREFIX%%/sbin/httpd
++apachectl_path=%%PREFIX%%/sbin/apachectl
++httpd_conf=%%PREFIX%%/etc/apache/httpd.conf
++mime_types=%%PREFIX%%/etc/apache/mime.types
++srm_conf=%%PREFIX%%/etc/apache/srm.conf
++access_conf=%%PREFIX%%/etc/apache/access.conf
+ show_order=0
+ max_servers=100
+ test_config=1
diff -urN webmin.orig/files/patch-bind8 webmin/files/patch-bind8
--- webmin.orig/files/patch-bind8 Thu Jan 1 09:00:00 1970
+++ webmin/files/patch-bind8 Sat Mar 16 10:00:44 2002
@@ -0,0 +1,18 @@
+--- bind8/config-freebsd-2.1.orig Sat Mar 16 06:50:14 2002
++++ bind8/config-freebsd-2.1 Sat Mar 16 06:50:47 2002
+@@ -1,5 +1,5 @@
+ soa_style=0
+-named_path=/usr/local/sbin/named
++named_path=%%PREFIX%%/sbin/named
+ named_conf=/etc/named.conf
+ show_list=0
+ records_order=0
+--- bind8/config-freebsd-2.2.orig Sat Mar 16 06:50:24 2002
++++ bind8/config-freebsd-2.2 Sat Mar 16 06:50:47 2002
+@@ -1,5 +1,5 @@
+ soa_style=0
+-named_path=/usr/local/sbin/named
++named_path=%%PREFIX%%/sbin/named
+ named_conf=/etc/named.conf
+ show_list=0
+ records_order=0
diff -urN webmin.orig/files/patch-config webmin/files/patch-config
--- webmin.orig/files/patch-config Thu Jan 1 09:00:00 1970
+++ webmin/files/patch-config Sat Mar 16 10:00:44 2002
@@ -0,0 +1,7 @@
+--- config-freebsd.orig Sat Mar 16 06:24:11 2002
++++ config-freebsd Sat Mar 16 06:24:22 2002
+@@ -1,3 +1,3 @@
+ find_pid_command=ps auxwwww | grep NAME | grep -v grep | awk '{ print $2 }'
+-path=/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin
++path=/bin:/usr/bin:/sbin:/usr/sbin:%%PREFIX%%/bin
+ ld_env=LD_LIBRARY_PATH
diff -urN webmin.orig/files/patch-dhcpd webmin/files/patch-dhcpd
--- webmin.orig/files/patch-dhcpd Thu Jan 1 09:00:00 1970
+++ webmin/files/patch-dhcpd Sat Mar 16 10:00:44 2002
@@ -0,0 +1,11 @@
+--- dhcpd/config-freebsd.orig Sat Mar 16 06:39:08 2002
++++ dhcpd/config-freebsd Sat Mar 16 06:39:24 2002
+@@ -1,6 +1,6 @@
+-dhcpd_conf=/usr/local/etc/dhcpd.conf
++dhcpd_conf=%%PREFIX%%/etc/dhcpd.conf
+ pid_file=/var/run/dhcpd.pid
+-dhcpd_path=/usr/local/sbin/dhcpd
++dhcpd_path=%%PREFIX%%/sbin/dhcpd
+ lease_file=/var/db/dhcpd.leases
+ lease_sort=0
+ dhcpd_nocols=5
diff -urN webmin.orig/files/patch-majordomo webmin/files/patch-majordomo
--- webmin.orig/files/patch-majordomo Thu Jan 1 09:00:00 1970
+++ webmin/files/patch-majordomo Sat Mar 16 10:00:44 2002
@@ -0,0 +1,9 @@
+--- majordomo/config.orig Sat Mar 16 06:41:27 2002
++++ majordomo/config Sat Mar 16 06:41:40 2002
+@@ -1,4 +1,4 @@
+-majordomo_cf=/usr/local/majordomo/majordomo.cf
+-program_dir=/usr/local/majordomo
++majordomo_cf=%%PREFIX%%/majordomo/majordomo.cf
++program_dir=%%PREFIX%%/majordomo
+ dynamic=0
+ sort_mode=0
diff -urN webmin.orig/files/patch-mysql webmin/files/patch-mysql
--- webmin.orig/files/patch-mysql Thu Jan 1 09:00:00 1970
+++ webmin/files/patch-mysql Sat Mar 16 10:00:44 2002
@@ -0,0 +1,22 @@
+--- mysql/config-freebsd.orig Sat Mar 16 06:56:20 2002
++++ mysql/config-freebsd Sat Mar 16 06:56:35 2002
+@@ -1,12 +1,12 @@
+-start_cmd=/usr/local/bin/safe_mysqld &
++start_cmd=%%PREFIX%%/bin/safe_mysqld &
+ perpage=25
+-mysql=/usr/local/bin/mysql
+-mysqldump=/usr/local/bin/mysqldump
+-mysqlimport=/usr/local/bin/mysqlimport
+-mysqlshow=/usr/local/bin/mysqlshow
++mysql=%%PREFIX%%/bin/mysql
++mysqldump=%%PREFIX%%/bin/mysqldump
++mysqlimport=%%PREFIX%%/bin/mysqlimport
++mysqlshow=%%PREFIX%%/bin/mysqlshow
+ login=root
+-mysql_libs=/usr/local/lib/mysql
+-mysqladmin=/usr/local/bin/mysqladmin
++mysql_libs=%%PREFIX%%/lib/mysql
++mysqladmin=%%PREFIX%%/bin/mysqladmin
+ style=0
+ add_mode=0
+ nodbi=0
diff -urN webmin.orig/files/patch-postfix webmin/files/patch-postfix
--- webmin.orig/files/patch-postfix Thu Jan 1 09:00:00 1970
+++ webmin/files/patch-postfix Sat Mar 16 10:00:44 2002
@@ -0,0 +1,14 @@
+--- postfix/config-freebsd.orig Sat Mar 16 07:07:19 2002
++++ postfix/config-freebsd Sat Mar 16 07:07:56 2002
+@@ -1,6 +1,6 @@
+-postfix_control_command=/usr/local/sbin/postfix
+-postfix_config_command=/usr/local/sbin/postconf
+-postfix_config_file=/usr/local/etc/postfix/main.cf
+-postfix_aliases_table_command=/usr/local/sbin/postalias
++postfix_control_command=%%PREFIX%%/sbin/postfix
++postfix_config_command=%%PREFIX%%/sbin/postconf
++postfix_config_file=%%PREFIX%%/etc/postfix/main.cf
++postfix_aliases_table_command=%%PREFIX%%/sbin/postalias
+ postfix_newaliases_command=/usr/bin/newaliases
+-postfix_lookup_table_command=/usr/local/sbin/postmap
++postfix_lookup_table_command=%%PREFIX%%/sbin/postmap
diff -urN webmin.orig/files/patch-postgres webmin/files/patch-postgres
--- webmin.orig/files/patch-postgres Thu Jan 1 09:00:00 1970
+++ webmin/files/patch-postgres Sat Mar 16 10:00:44 2002
@@ -0,0 +1,20 @@
+--- postgresql/config-freebsd.orig Sat Mar 16 07:14:55 2002
++++ postgresql/config-freebsd Sat Mar 16 07:15:01 2002
+@@ -1,11 +1,11 @@
+ basedb=template1
+ pass=
+-hba_conf=/usr/local/pgsql/data/pg_hba.conf
+-pid_file=/usr/local/pgsql/data/postmaster.pid
+-stop_cmd=/usr/local/etc/rc.d/010.pgsql.sh stop
+-start_cmd=/usr/local/etc/rc.d/010.pgsql.sh start
++hba_conf=%%PREFIX%%/pgsql/data/pg_hba.conf
++pid_file=%%PREFIX%%/pgsql/data/postmaster.pid
++stop_cmd=%%PREFIX%%/etc/rc.d/010.pgsql.sh stop
++start_cmd=%%PREFIX%%/etc/rc.d/010.pgsql.sh start
+ perpage=25
+-psql=/usr/local/bin/psql
++psql=%%PREFIX%%/bin/psql
+ login=pgsql
+-plib=/usr/local/lib
++plib=%%PREFIX%%/lib
+ nodbi=0
diff -urN webmin.orig/files/patch-proftpd webmin/files/patch-proftpd
--- webmin.orig/files/patch-proftpd Thu Jan 1 09:00:00 1970
+++ webmin/files/patch-proftpd Sat Mar 16 10:00:44 2002
@@ -0,0 +1,9 @@
+--- proftpd/config-freebsd.orig Sat Mar 16 07:16:37 2002
++++ proftpd/config-freebsd Sat Mar 16 07:16:38 2002
+@@ -1,4 +1,4 @@
+-proftpd_path=/usr/local/libexec/proftpd
+-proftpd_conf=/usr/local/etc/proftpd.conf
++proftpd_path=%%PREFIX%%/libexec/proftpd
++proftpd_conf=%%PREFIX%%/etc/proftpd.conf
+ pid_file=/var/run/proftpd.pid
+ ftpusers=/etc/ftpusers
diff -urN webmin.orig/files/patch-samba webmin/files/patch-samba
--- webmin.orig/files/patch-samba Thu Jan 1 09:00:00 1970
+++ webmin/files/patch-samba Sat Mar 16 10:00:44 2002
@@ -0,0 +1,24 @@
+--- samba/config-freebsd.orig Sat Mar 16 06:27:11 2002
++++ samba/config-freebsd Sat Mar 16 06:28:18 2002
+@@ -1,13 +1,13 @@
+-alt_smb_conf=/usr/local/etc/smb.conf.default
++alt_smb_conf=%%PREFIX%%/etc/smb.conf.default
+ dont_convert=root toor daemon operator bin tty sys kmem adm lp smtp uucp nuucp listen nobody noaccess nobody4 pop lp mail postmaster news man ftp games smmsp mailnull bind xten gnats www pgsql mysql
+ list_printers_command=lpc status | grep "[A-z0-9]:" | sed -e 's/://g'
+-name_server=/usr/local/sbin/nmbd
++name_server=%%PREFIX%%/sbin/nmbd
+ run_from_inetd=0
+-samba_password_program=/usr/local/bin/smbpasswd
+-samba_server=/usr/local/sbin/smbd
+-samba_status_program=/usr/local/bin/smbstatus
+-smb_conf=/usr/local/etc/smb.conf
+-smb_passwd=/usr/local/private/smbpasswd
++samba_password_program=%%PREFIX%%/bin/smbpasswd
++samba_server=%%PREFIX%%/sbin/smbd
++samba_status_program=%%PREFIX%%/bin/smbstatus
++smb_conf=%%PREFIX%%/etc/smb.conf
++smb_passwd=%%PREFIX%%/private/smbpasswd
+ text_lists=0
+-swat_path=/usr/local/sbin/swat
++swat_path=%%PREFIX%%/sbin/swat
+ sort_mode=0
diff -urN webmin.orig/files/patch-squid webmin/files/patch-squid
--- webmin.orig/files/patch-squid Thu Jan 1 09:00:00 1970
+++ webmin/files/patch-squid Sat Mar 16 10:00:44 2002
@@ -0,0 +1,18 @@
+--- squid/config-freebsd.orig Sat Mar 16 06:35:56 2002
++++ squid/config-freebsd Sat Mar 16 06:37:56 2002
+@@ -1,9 +1,9 @@
+-log_dir=/usr/local/squid/logs
+-squid_path=/usr/local/sbin/squid
+-cache_dir=/usr/local/squid/cache
+-squid_conf=/usr/local/etc/squid/squid.conf
+-pid_file=/usr/local/squid/logs/squid.pid
+-cachemgr_path=/usr/local/sbin/cachemgr.cgi
++log_dir=%%PREFIX%%/squid/logs
++squid_path=%%PREFIX%%/sbin/squid
++cache_dir=%%PREFIX%%/squid/cache
++squid_conf=%%PREFIX%%/etc/squid/squid.conf
++pid_file=%%PREFIX%%/squid/logs/squid.pid
++cachemgr_path=%%PREFIX%%/libexec/cachemgr.cgi
+ calamaris=calamaris
+ cal_max=50000
+ cal_args=-aw
diff -urN webmin.orig/files/patch-stunnel webmin/files/patch-stunnel
--- webmin.orig/files/patch-stunnel Thu Jan 1 09:00:00 1970
+++ webmin/files/patch-stunnel Sat Mar 16 10:00:44 2002
@@ -0,0 +1,5 @@
+--- stunnel/config.orig Sat Mar 16 07:48:25 2002
++++ stunnel/config Sat Mar 16 07:48:41 2002
+@@ -1 +1 @@
+-stunnel_path=/usr/local/sbin/stunnel
++stunnel_path=%%PREFIX%%/sbin/stunnel
diff -urN webmin.orig/files/patch-wuftpd webmin/files/patch-wuftpd
--- webmin.orig/files/patch-wuftpd Thu Jan 1 09:00:00 1970
+++ webmin/files/patch-wuftpd Sat Mar 16 10:00:44 2002
@@ -0,0 +1,9 @@
+--- wuftpd/config-freebsd.orig Sat Mar 16 06:42:57 2002
++++ wuftpd/config-freebsd Sat Mar 16 06:43:10 2002
+@@ -1,5 +1,5 @@
+ ftpgroups=/etc/ftpgroups
+-ftpd_path=/usr/local/libexec/ftpd
++ftpd_path=%%PREFIX%%/libexec/ftpd
+ ftphosts=/etc/ftphosts
+ ftpconversions=/etc/ftpconversions
+ pid_file=/var/run/ftpd.pid
diff -urN webmin.orig/files/patch-xinetd webmin/files/patch-xinetd
--- webmin.orig/files/patch-xinetd Thu Jan 1 09:00:00 1970
+++ webmin/files/patch-xinetd Sat Mar 16 10:00:44 2002
@@ -0,0 +1,8 @@
+--- xinetd/config-freebsd.orig Sat Mar 16 07:51:04 2002
++++ xinetd/config-freebsd Sat Mar 16 07:51:18 2002
+@@ -1,4 +1,4 @@
+ xinetd_conf=/etc/xinetd.conf
+ protocols_file=/etc/protocols
+ pid_file=/var/run/xinetd.pid
+-start_cmd=/usr/local/sbin/xinetd
++start_cmd=%%PREFIX%%/sbin/xinetd
>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?86d6y58c92.wl>