[patch] Updated freebsd-usbin patch

freebsd-usbin.patch (text/plain), 11.91 KB, created by Diego Elio Pettenò (RETIRED) on 2005-03-16 06:06:43 UTC

diff -x digest* -x Manifest -Npaur orig-overlay/sys-apps/freebsd-usbin/files/crontab overlay/sys-apps/freebsd-usbin/files/crontab
--- orig-overlay/sys-apps/freebsd-usbin/files/crontab	Thu Jan  1 00:00:00 1970
+++ overlay/sys-apps/freebsd-usbin/files/crontab	Fri Mar 11 20:04:12 2005
@@ -0,0 +1,38 @@
+# for vixie cron
+#
+# $Header: /var/cvsroot/gentoo-x86/sys-process/vixie-cron/files/crontab,v 1.1 2005/03/04 23:59:48 ciaranm Exp $
+#
+
+# Global variables
+SHELL=/bin/bash
+PATH=/sbin:/bin:/usr/sbin:/usr/bin
+MAILTO=root
+HOME=/
+
+# check scripts in cron.hourly, cron.daily, cron.weekly and cron.monthly
+*/15 * * * *	root	test -x /usr/sbin/run-crons && /usr/sbin/run-crons 
+0  *  * * *	root	rm -f /var/spool/cron/lastrun/cron.hourly
+0  3  * * *	root	rm -f /var/spool/cron/lastrun/cron.daily
+15 4  * * 6	root	rm -f /var/spool/cron/lastrun/cron.weekly
+30 5  1 * *	root	rm -f /var/spool/cron/lastrun/cron.monthly
+
+# FreeBSD specific services
+*/5     *       *       *       *       root    /usr/libexec/atrun
+#
+# Save some entropy so that /dev/random can re-seed on boot.
+*/11    *       *       *       *       operator /usr/libexec/save-entropy
+#
+# Rotate log files every hour, if necessary.
+0       *       *       *       *       root    newsyslog
+#
+# Perform daily/weekly/monthly maintenance.
+# This makes useless cronbase provided things, but those is gentoo-related
+# and instead this is fbsd related. When we'll move this to gentoo standard
+# it will be better
+1       3       *       *       *       root    periodic daily
+15      4       *       *       6       root    periodic weekly
+30      5       1       *       *       root    periodic monthly
+#
+# Adjust the time zone if the CMOS clock keeps local time, as opposed to
+# UTC time.  See adjkerntz(8) for details.
+1,31    0-5     *       *       *       root    adjkerntz -a
diff -x digest* -x Manifest -Npaur orig-overlay/sys-apps/freebsd-usbin/files/freebsd-usbin-5.3-r1-makefile-docpaths.patch overlay/sys-apps/freebsd-usbin/files/freebsd-usbin-5.3-r1-makefile-docpaths.patch
--- orig-overlay/sys-apps/freebsd-usbin/files/freebsd-usbin-5.3-r1-makefile-docpaths.patch	Thu Jan  1 00:00:00 1970
+++ overlay/sys-apps/freebsd-usbin/files/freebsd-usbin-5.3-r1-makefile-docpaths.patch	Thu Mar 10 22:00:45 2005
@@ -0,0 +1,31 @@
+diff -Npaur usr.sbin.orig/ntp/doc/Makefile usr.sbin/ntp/doc/Makefile
+--- usr.sbin.orig/ntp/doc/Makefile	Thu Mar 10 21:57:57 2005
++++ usr.sbin/ntp/doc/Makefile	Thu Mar 10 21:59:04 2005
+@@ -2,7 +2,7 @@
+ 
+ MAINTAINER=	sheldonh
+ 
+-FILESDIR=	${SHAREDIR}/doc/ntp
++FILESDIR=	${DOCDIR}/ntp
+ 
+ FILES=	accopt.html assoc.html audio.html authopt.html build.html \
+ 	clockopt.html \
+diff -Npaur usr.sbin.orig/pcvt/Misc/Doc/Makefile usr.sbin/pcvt/Misc/Doc/Makefile
+--- usr.sbin.orig/pcvt/Misc/Doc/Makefile	Thu Mar 10 21:57:58 2005
++++ usr.sbin/pcvt/Misc/Doc/Makefile	Thu Mar 10 21:59:39 2005
+@@ -4,6 +4,6 @@ NOOBJ=	noobj
+ FILES=	Acknowledgements Bibliography CharGen \
+ 	Charsets EscapeSequences Keyboard.HP Keyboard.VT \
+ 	NotesAndHints
+-FILESDIR=	${BINDIR}/Doc
++FILESDIR=	${DOCDIR}/pcvt_misc
+ 
+ .include <bsd.prog.mk>
+diff -Npaur usr.sbin.orig/pcvt/Misc/Makefile.inc usr.sbin/pcvt/Misc/Makefile.inc
+--- usr.sbin.orig/pcvt/Misc/Makefile.inc	Thu Mar 10 21:57:58 2005
++++ usr.sbin/pcvt/Misc/Makefile.inc	Thu Mar 10 21:58:38 2005
+@@ -2,3 +2,4 @@
+ 
+ DISTRIBUTION=	doc
+ BINDIR=		${SHAREDIR}/pcvt
++FILESDIR=	${DOCDIR}/pcvt
diff -x digest* -x Manifest -Npaur orig-overlay/sys-apps/freebsd-usbin/files/freebsd-usbin-5.3-r1-nologin-makefile.patch overlay/sys-apps/freebsd-usbin/files/freebsd-usbin-5.3-r1-nologin-makefile.patch
--- orig-overlay/sys-apps/freebsd-usbin/files/freebsd-usbin-5.3-r1-nologin-makefile.patch	Thu Jan  1 00:00:00 1970
+++ overlay/sys-apps/freebsd-usbin/files/freebsd-usbin-5.3-r1-nologin-makefile.patch	Thu Mar 10 20:57:56 2005
@@ -0,0 +1,11 @@
+--- Makefile.orig	Mon Nov  8 23:26:31 2004
++++ Makefile	Mon Nov  8 23:35:53 2004
+@@ -4,7 +4,7 @@
+ PROG=	nologin
+ MAN=	nologin.5 nologin.8
+ 
+-SYMLINKS=	${BINDIR}/nologin /sbin/nologin
++SYMLINKS=	${BINDIR}/nologin ${DESTDIR}sbin/nologin
+ 
+ # It is important that nologin be statically linked for security
+ # reasons.  A dynamic non-setuid binary can be linked against a trojan
diff -x digest* -x Manifest -Npaur orig-overlay/sys-apps/freebsd-usbin/files/freebsd-usbin-cron-gentoo-location.patch overlay/sys-apps/freebsd-usbin/files/freebsd-usbin-cron-gentoo-location.patch
--- orig-overlay/sys-apps/freebsd-usbin/files/freebsd-usbin-cron-gentoo-location.patch	Thu Jan  1 00:00:00 1970
+++ overlay/sys-apps/freebsd-usbin/files/freebsd-usbin-cron-gentoo-location.patch	Fri Mar 11 20:04:12 2005
@@ -0,0 +1,40 @@
+diff -Npaur usr.sbin.org/cron/cron/cron.8 usr.sbin/cron/cron/cron.8
+--- usr.sbin.org/cron/cron/cron.8	Fri Mar 11 15:27:30 2005
++++ usr.sbin/cron/cron/cron.8	Fri Mar 11 15:30:29 2005
+@@ -43,7 +43,7 @@ so you don't need to start it with '&'.
+ The
+ .Nm
+ utility searches
+-.Pa /var/cron/tabs
++.Pa /var/spool/cron/tabs
+ for crontab files which are named after accounts in
+ .Pa /etc/passwd ;
+ crontabs found are loaded into memory.
+diff -Npaur usr.sbin.org/cron/cron/pathnames.h usr.sbin/cron/cron/pathnames.h
+--- usr.sbin.org/cron/cron/pathnames.h	Fri Mar 11 15:27:30 2005
++++ usr.sbin/cron/cron/pathnames.h	Fri Mar 11 15:28:43 2005
+@@ -28,7 +28,7 @@
+ 			 * to; SPOOL_DIR, ALLOW_FILE, DENY_FILE, and LOG_FILE
+ 			 * are all relative to this directory.
+ 			 */
+-#define CRONDIR		"/var/cron"
++#define CRONDIR		"/var/spool/cron"
+ #endif
+ 
+ 			/* SPOOLDIR is where the crontabs live.
+diff -Npaur usr.sbin.org/cron/crontab/crontab.1 usr.sbin/cron/crontab/crontab.1
+--- usr.sbin.org/cron/crontab/crontab.1	Fri Mar 11 15:27:30 2005
++++ usr.sbin/cron/crontab/crontab.1	Fri Mar 11 15:30:05 2005
+@@ -115,9 +115,9 @@ from the editor, the modified crontab wi
+ .Xr crontab 5 ,
+ .Xr cron 8
+ .Sh FILES
+-.Bl -tag -width /var/cron/allow -compact
+-.It Pa /var/cron/allow
+-.It Pa /var/cron/deny
++.Bl -tag -width /var/spool/cron/allow -compact
++.It Pa /var/spool/cron/allow
++.It Pa /var/spool/cron/deny
+ .El
+ .Sh STANDARDS
+ The
diff -x digest* -x Manifest -Npaur orig-overlay/sys-apps/freebsd-usbin/files/vixie-cron.rc6 overlay/sys-apps/freebsd-usbin/files/vixie-cron.rc6
--- orig-overlay/sys-apps/freebsd-usbin/files/vixie-cron.rc6	Thu Jan  1 00:00:00 1970
+++ overlay/sys-apps/freebsd-usbin/files/vixie-cron.rc6	Fri Mar 11 20:04:12 2005
@@ -0,0 +1,22 @@
+#!/sbin/runscript
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-process/vixie-cron/files/vixie-cron.rc6,v 1.1 2005/03/04 23:59:48 ciaranm Exp $
+
+depend() {
+	use logger
+	need localmount
+	provide cron	
+}
+
+start() {
+	ebegin "Starting vixie-cron"
+	start-stop-daemon --start --quiet --exec /usr/sbin/cron
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping vixie-cron"
+	start-stop-daemon --stop --quiet --pidfile /var/run/cron.pid
+	eend $?
+}
diff -x digest* -x Manifest -Npaur orig-overlay/sys-apps/freebsd-usbin/freebsd-usbin-5.3-r1.ebuild overlay/sys-apps/freebsd-usbin/freebsd-usbin-5.3-r1.ebuild
--- orig-overlay/sys-apps/freebsd-usbin/freebsd-usbin-5.3-r1.ebuild	Wed Mar 16 13:33:25 2005
+++ overlay/sys-apps/freebsd-usbin/freebsd-usbin-5.3-r1.ebuild	Tue Mar 15 01:25:45 2005
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-projects/bsd/fbsd/overlay/sys-apps/freebsd-usbin/freebsd-usbin-5.3-r1.ebuild,v 1.1 2005/02/28 00:17:13 angusyoung Exp $
 
-inherit freebsd-utils flag-o-matic eutils
+inherit freebsd-utils flag-o-matic eutils cron
 
 CONTRIB="freebsd-contrib-${PV}"
 UBIN="freebsd-ubin-${PV}"
@@ -26,16 +26,53 @@ SRC_URI="${BASE_SRC_URI}${P}.tar.bz2 
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~x86-fbsd"
-IUSE=""
+IUSE="atm bluetooth crypt ssl sendmail usb bind named dnssec bind-utils ipv6
+	pf acpi lpr ipfilter isdn pam ssl radius netgraph minimal suid ipsec"
 DEPEND="=sys-devel/freebsd-mk-defs-5.3*
 	=sys-libs/freebsd-lib-5.3*
 	=sys-libs/freebsd-libexec-5.3*
 	=sys-kernel/freebsd-sources-5.3*
-	=sys-kernel/freebsd-headers-5.3*"
-PROVIDE="virtual/cron"
+	=sys-kernel/freebsd-headers-5.3*
+	ssl? ( =sys-apps/freebsd-crypto-5.3* )
+	sendmail? ( net-mail/mailbase )
+	sys-process/cronbase"
+PROVIDE="virtual/cron
+	lpr? virtual/lpr
+	sendmail? virtual/mta"
 
 S=${WORKDIR}/usr.sbin
 
+pkg_setup() {
+	if ! use bind && ( use named || use dnssec || use bind-utils ); then
+		eerror "Please enable bind if you want to use named, dnssec or bind-utils"
+	fi	
+
+	# Release crunch is something like minimal. It seems to remove everything
+	# which is not needed to work.
+	use minimal && mymakeopts="${mymakeopts} RELEASE_CRUNCH= "
+			
+	use atm || mymakeopts="${mymakeopts} NO_ATM= "
+	use bluetooth || mymakeopts="${mymakeopts} NO_BLUETOOTH= "
+	use bind || mymakeopts="${mymakeopts} NO_BIND= "
+	use dnssec || mymakeopts="${mymakeopts} NO_BIND_DNSSEC= "
+	use named || mymakeopts="${mymakeopts} NO_BIND_NAMED= "
+	use ipv6 || mymakeopts="${mymakeopts} NOINET6= "
+	use ipfilter || mymakeopts="${mymakeopts} NO_IPFILTER= "
+	use pf || mymakeopts="${mymakeopts} NO_PF= "
+	use lpr || mymakeopts="${mymakeopts} NO_LPR= "
+	use crypt || mymakeopts="${mymakeopts} NOCRYPT= "
+	use ssl || mymakeopts="${mymakeopts} NO_OPENSSL= "
+	use sendmail || mymakeopts="${mymakeopts} NO_SENDMAIL= "
+	use usb || mymakeopts="${mymakeopts} NO_USB= "
+	use acpi || mymakeopts="${mymakeopts} NO_ACPI= "
+	use isdn || mymakeopts="${mymakeopts} NO_I4B= "
+	use pam || mymakeopts="${mymakeopts} NOPAM= "
+	use ssl || mymakeopts="${mymakeopts} NO_OPENSSL= "
+	use radius || mymakeopts="${mymakeopts} NORADIUS= "
+	use suid || mymakeopts="${mymakeopts} NOSUID= "
+	use ipsec || mymakeopts="${mymakeopts} NOIPSEC= "
+}
+
 src_unpack() {
 	unpack ${P}.tar.bz2
 	unpack ${CONTRIB}.tar.bz2
@@ -92,12 +129,13 @@ src_unpack() {
 	# sandbox)
 	cd ${S}/mailwrapper
 	epatch ${FILESDIR}/${MY_PATCH}-mailwrapper-makefile.patch
-
-	# Installation related patches
-	cd ${S}/nologin
-	epatch ${FILESDIR}/${MY_PATCH}-nologin-makefile.patch
+	
 	cd ${S}/pcvt/keycap
 	epatch ${FILESDIR}/${MY_PATCH}-pcvt_keycap-makefile.patch
+
+	cd ${S}
+	epatch ${FILESDIR}/${P}-r1-makefile-docpaths.patch
+	epatch ${FILESDIR}/${PN}-cron-gentoo-location.patch
 }
 
 src_compile() {
@@ -106,36 +144,40 @@ src_compile() {
 	# kldxref does not build with -O2
 	replace-flags "-O?" "-O1"
 
+	append-ldflags -z,now
+
 	einfo "Building library dependencies for this package"
-	cd ${WORKDIR}/lib/bind
-	emake || die "emake libbind failed"
-	cd ${WORKDIR}/lib/libsm
-	emake || die "emake libsm failed"
-	cd ${WORKDIR}/lib/libsmdb
-	emake || die "emake libsmdb failed"
-	cd ${WORKDIR}/lib/libsmutil
-	emake || die "emake libsmdb failed"
+	if use bind; then
+		cd ${WORKDIR}/lib/bind
+		fmake || die "fmake libbind failed"
+	fi
+	
+	if use sendmail; then
+		cd ${WORKDIR}/lib/libsm
+		fmake || die "fmake libsm failed"
+		cd ${WORKDIR}/lib/libsmdb
+		fmake || die "fmake libsmdb failed"
+		cd ${WORKDIR}/lib/libsmutil
+		fmake || die "fmake libsmdb failed"
+	fi
 	
 	einfo "Building package now"
 	cd ${S}
-	emake || die "emake failed"
+	fmake || die "fmake failed"
 }
 
 src_install() {	
+	docrondir
+	newinitd ${FILESDIR}/vixie-cron.rc6 freebsd-cron
+	insinto /etc; doins ${FILESDIR}/crontab
+
 	# By creating these two directories we avoid having to do a 
 	# more complex hack inside lpr/SMM.doc and nologin makefiles.
-	dodir ${D}/usr/share/doc
-	dodir ${D}/sbin
-	emake DESTDIR=${D} install || die "Install failed"
-	enforce_correct_path
-}
-
-enforce_correct_path() {
-	local WRONG="local/sys-apps/freebsd-usbin/files/"
-	local CORRECT="/usr/libexec/lpr/ru/"
-
-	einfo "Correcting the path of files installed in an incorrect dir"
-	mv ${D}/${PORTDIR}/${WRONG}/bjc-240.sh.sample ${D}/${CORRECT}
-	rm -rf ${D}/${PORTDIR}
-
+	dodir /usr/share/doc
+	dodir /sbin
+	dodir /usr/libexec
+
+	# FILESDIR is used by some makefiles which will install files
+	# in the wrong place, just put it in the doc directory.
+	fmake DESTDIR=${D} DOCDIR=/usr/share/doc/${PF} install || die "Install failed"
 }