diff options
author | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 13:49:04 -0700 |
---|---|---|
committer | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 17:38:18 -0700 |
commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /sys-freebsd/freebsd-usbin | |
download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2 gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip |
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'sys-freebsd/freebsd-usbin')
33 files changed, 1266 insertions, 0 deletions
diff --git a/sys-freebsd/freebsd-usbin/Manifest b/sys-freebsd/freebsd-usbin/Manifest new file mode 100644 index 000000000000..a047dc432c3f --- /dev/null +++ b/sys-freebsd/freebsd-usbin/Manifest @@ -0,0 +1,21 @@ +DIST freebsd-contrib-8.2.tar.bz2 40931651 SHA256 8b9cb688e81c2980b3fc66411d00ab277a24dadd50d5bdd5e0e6c63ac687b9b6 SHA512 4f7bf825b579fbb88f2aac531d07e531474179c63fa0b66c4e80821290a8c94bf611bb4dcaef51b762aacd25b11dfae798a4ec3bad3b9e3f6b3490ebfaa72476 WHIRLPOOL edd3d9e26e8d22d9028082e107ec1a44402e206dab8722f34b445676959305996c3f699152af42ace249b7f58498492787823b172fb6bcb273119c6bb50a35f0 +DIST freebsd-contrib-9.1.tar.bz2 54751432 SHA256 e7ffa056d4050ce03ee8e23e276e2a9a494326a98d60c43bee2afcc59576deb8 SHA512 71be13049258c6e6b5e4f63cc16da5d349a89d68f04d87446e4ad33ae8bf2a93ea67d9c256b7bec60b61e65db0487268070cfb77a484c3ac0f8ba368b48c2438 WHIRLPOOL a2a84423175499208d34809e802284d6ba649f317c3a9ad8b7312fa19efe142ebadab0048bac0db8e988e59f9a7468ac7c5d0d25e78b82bdb269a20d18153cee +DIST freebsd-etc-8.2.tar.bz2 188629 SHA256 6bc745fa259f9fa2b65df865d45443a7b23c24445195e33a4ac50bf1040ae238 SHA512 3e5c106754a6a1ac806bd46b711fba7ee9cb31a4eab5262c995a5d59dbeb02f756dd8b495640dda94189d204a5d2c5218de2bd23467172d6a4ebe1048986e89c WHIRLPOOL 23b658a214f1a64c43420351020e32b1182e9aac3ed5253f49ee86f9cee9166ce32bd556cd2a2b3c0e60a165462a8700f37dea19e57ad5716415e17f61da912e +DIST freebsd-etc-9.1.tar.bz2 207776 SHA256 a317bf85532d6192f5506e8d7bd5d5c201fe24017700e3a974a7712c2c69cdb8 SHA512 4fbe56fde519cf2f44e39a8869efa26c34f703cf540f4a83389da8d170873d7c6fb18e4010e643b8d793cfc5c55d15eeb198057a5b2a8da9d9e8f791801bf314 WHIRLPOOL 0c27019fe140fe96f870697acbaa89ac2f281f55b892c5791b08abf1cfa4da94d9d42a1df1c2091317573ed7234253857aecb797065f911a0a5d57bbf64349a5 +DIST freebsd-gnu-8.2.tar.bz2 815379 SHA256 34be1326b8e188427ea4a59de5dd24049f99adb5e172d61a645db1b7124f7876 SHA512 8b278e386b22b22658eef18341073c1c757b86ecdef5c5b543fb781cfee295d71cef599544eda5f8cf273fc22d28a1ab14d912086ff8398c36ee2b71281617d4 WHIRLPOOL aaf91562f147095e09a9f6aa2d4c33494f430cbe7340377edff1b8a44cc60edfe4af7ef90350018f0c80e82f5518110689cb582bb227d2360488dfbdd7bcb7c8 +DIST freebsd-gnu-9.1.tar.bz2 795778 SHA256 3b99c1fa1087bf69549e0990a0d7997954533ac9d7938c4760ec2b01aa509a5f SHA512 b05f2a5a10bdaeef19dfd0e962bc09f1571288a831e9345f404b920037f47db5c0ca3d620d1cbdd138b18bca1c3feab5b211b57e3041727341e5238cb9feb4fd WHIRLPOOL 4f776b99296c4fcc0d6f4d30a12b0773f6704292e1361826b260ce34dcc8e537ef7eb7c6332c4988e0e03bc84ca07fb18e6b2785fe4c6f175c08865b72d6bb0b +DIST freebsd-include-8.2.tar.bz2 138992 SHA256 fade90621a8e4880c9583c1ee49965400c88e53ac6c07cb5dcf320e4f069271d SHA512 6bc820dde866589ef75f9f0d1c469d815439bdd4c79f0e1a2482ec58f938b638cb9106969b321aa72492f933c95c76895ce489727a5e265798c93adc75dd64e3 WHIRLPOOL 64d3160c4ac46a62f5969058e07bd160c92284f08805ed917f2073ba1cb5907cfca16c5893daf30254d39b4fcdf641ab6afb9817607f65e7789d3049e8103947 +DIST freebsd-include-9.1.tar.bz2 146881 SHA256 861dce3f39e6806762b102361017cbe148f0e2b768b3fca152f8426f44a2942f SHA512 779c8315ce2b10b343bb62e331525d510b0d68ce5d665a1672bd6f4d1eff6445bc6b7a0f178b319828aa203c4e4c04c561ce793052703f4f936ce9711280a0c9 WHIRLPOOL e16ba45d380591ba007ca59579d45f61ffc1aa1a4c08fc11ed2794979b0a189a346c81b4f70a44ee199d50a72024930f28587ad62a9cd6854fc937eb466ec115 +DIST freebsd-lib-8.2.tar.bz2 3323878 SHA256 e3590c12794fcb5ba8eb7a1f58b497587cf19f9200b3254c194a793da3b5bfb0 SHA512 c059cfdd1099bb519b2a5c43fb7e7104c500ef8906229ed7eb9e420cb3a217cdaf8655e9e7a9f45cfadc5491f8115e0e738fd49251d9f0c3a83780845b09f007 WHIRLPOOL 95f98a372f44a89bc8ac3029ec065dbbfec338e6f889d057d75644bfcdfb9d27fdc0421d7e392cad5a823712b97f0857297ec3d321580254c63032c22b95792e +DIST freebsd-lib-9.1.tar.bz2 3206685 SHA256 f31fa8107b4de711c548f6d0c1bb1f81d09f51bcc3b14a1e9e90bb0e7cc4a35d SHA512 40d0c36b6b889c404fa0e0afa38ba4e84a55bc88ffa2f98a70afbd7a32c4f32c158617ba770567d082a986d62c09b3ec8db3dc5ab853ee1c9bbe0b90bb82396e WHIRLPOOL 581878bf9c43184b043b4293409b85901c9ed1f9bd279e965414aca41ba50950848ebda3ee10a503a028135dfd2765e95a11acd4e62a11c528e104392bbbd8d0 +DIST freebsd-libexec-8.2.tar.bz2 289147 SHA256 10b996d1d8cd044ee2e7a877e5e6ad2bf050cce9b3bd402a5e0dea7d290b595d SHA512 abe6cf5a268675d7dcb1c214c46fef47a3fb09b31947f5d8a0b938d352295efe0249beb5007649c52187bf4c221b6ebf074d18dfe9bafd168cae09ee02ab608d WHIRLPOOL 27e854fe465eb933dd8e27c5a09b063e4d3798b54e0914c79a9120dcdc34cc5d525a0c92da7b645ff7ab2ab4f34c7f7b2783012dfa5004407acd11150062b7ad +DIST freebsd-libexec-9.1.tar.bz2 304592 SHA256 71e6e9e41328c2148c54b81ad9b59f912a1d5f0d52e17ac07f223aa7a94b82be SHA512 7baa4160dda2610250dd52f445e24478e0f1ea10bce21fcd0e5d1b856f399b896adc334114de0c7f61a5637e4349bb1688fdbe5c72798d8568ae791114710b92 WHIRLPOOL d800f477ac5c9ad6dae3e0091c83e107609b5a1e3aa79e9533fcd10a8dd34ff7733ab9523eae7c292310fe94f6a529209cae6b9e8bac6b47244e59834593e74b +DIST freebsd-sbin-8.2.tar.bz2 1211665 SHA256 8b7e21a66b4696e8763d29b8b02b2d35f29fc51820a194d1e469e7cace84c527 SHA512 c6643c29ab62344c98d8991708798730ee1c17e6478071718beeaa79788300a1f4ed2e6aeb8e39e3c216877d4ed2ac85b2a9531d534f1ac5125a508927898959 WHIRLPOOL 2a21cd0f15f95d66718031680ac87f1fe73f1e1b03cb012e1db1dd1bd2fe2bb7897457a8ba2f5a28c8806775611dca542cbadec16566c47ab9efa673e2cb53f3 +DIST freebsd-sbin-9.1.tar.bz2 1273913 SHA256 45008b0733b232ef03707ef5fa3e5c889e3b3728393d736bd9a869ea83be6447 SHA512 9f186602b7de96f268c352ca386986652fddf5570e7eca1afa8c0d2bdc83b57df1198efe47f36dd5c7a6abf4f9c935f1c8207a4a12a6b2153bd6c3c6292719dc WHIRLPOOL 20920dfa9607a0ce854319cef29bbd77fb1b31f6f6cfd5ac60cbd678169e43929e215743fe636d0c224443f3e6149a8f07c292d647f7f901592795ac292699f9 +DIST freebsd-src-10.1.tar.xz 115049476 SHA256 f919287a5ef51d4f133f27c99c54f2e8054f408d3dd53bc60f4e233cc75ec03d SHA512 4ded32b451e2807e24a06305502f88ea633b2899a7ccd9cab3dc98fc865ef91324c93c512a08cf6e295313a8d7e79aa9d7af07da40e7276d986b06419b984152 WHIRLPOOL 1eff9419d89b8a70f064171883d92e160b250cd637972eb9107a19d7b3c904b554c4f51eaa9ff9642ef2c4234bde05cf9aef16d0c39280b55084f831700dea80 +DIST freebsd-sys-8.2.tar.bz2 25835329 SHA256 0c6c7b61aae94db2931f985d5899f3bca78fc8ffab6b598fbaa158142d676f16 SHA512 6ea4516a5c52e25c4f993f7acb875463a5caea93dbdf250c5d48eee95fff226956e9f030cab7e341b5e6a132325bc3dbf93dcb4b1185acb011918e50b1a22be3 WHIRLPOOL 870deeff877c6b9fc812a4260e4fdbb6715a5dc2065cab3bfbf2a42d876f6654703ccb124275a4e2c410cef48f3db02b63cc76059eccf9cf90244826f35b7a15 +DIST freebsd-sys-9.1.tar.bz2 32588103 SHA256 b93a7ac8334ac16cc9f60665048e5ef812c0a6c62f10d0b0a674aec3f56516a8 SHA512 7dc9d9e00dde8f592bb171f4386d02b655b73cb4f153fe5ec063d010a148ef0639eae0dcdb3eeb09ecd1e3653c69e49a2d261329fa6d0381d2ddabe258ddde6d WHIRLPOOL c8348344dfb14bad64bd3a78ee615ddd29203175b292233254f8ba175e7a3fb7218af6f95f7b4dbf394c0354bafe9d8bb0c21cdf0ceaeb697214964b280469b3 +DIST freebsd-ubin-8.2.tar.bz2 1808012 SHA256 6b99554f3ad6ee052069b347eb6e6219b71598d7b222acb90a24cbfc805c7b68 SHA512 48d0103323e820c431aa4f62d3be40cb3b200fb62e3de01f36c88760395bf2ba3367c51f3fa72da4dbccc2812176a051a12ca5cb7e84125c3e0fc78d4cab2c29 WHIRLPOOL ea8f3a29a37b42c2b5bcc0f2c343fa1538522157ef075363c94606a4620a590e9a03f856ce2494e3e727935b62431991d0aa9fde71de699e78b4fe225bdf1c2c +DIST freebsd-ubin-9.1.tar.bz2 1910472 SHA256 ff6e586f213534b6ec2e65002c0dee64063d76ddad515c12221b1a80a1815e48 SHA512 74ae0aceec8597aa66c3f1ab313f0685a3c63d7273c36ae7baf8794275ad9bca241c60c3f6281cccf6d531d250d7611099977d3b1a27279cef3586401b6af05e WHIRLPOOL c85a3c9cf2bceff2c60ff03556bcc81d3aca22b0bce3c9538990071ac0a907236eee5ae7743ad22c5fd309b047ebf392aaaf2fe177ef5790ea869aff3da7e2fe +DIST freebsd-usbin-8.2.tar.bz2 2443024 SHA256 aa7cabf10f5c3a9daabea32e4de24d04ec312247842981476da666eff5054603 SHA512 bcb8ff3df54848b9107bbb52e5ced7a91e24bb181f06769b6997221729b8064ec17652eaf7500de3268cbcb63ff5760beb54d15fc78c27b02687b5b1067c74a6 WHIRLPOOL 20f5278e2a1dd387a75b44f10507958d6c0e84a2faa1bddbf808c14ab86d8dd14a956192911bbc1880f5f5f7bd05972dcbb4aec85d241f0dcf91bf4246883f0a +DIST freebsd-usbin-9.1.tar.bz2 2670916 SHA256 b938c20b8c09aa9a610e13b69b9afeea72f561ab3636a59fba2bdac290f4db75 SHA512 21c234312f70eb35cd2926519efc1f61592892f5d0940786dbeb959c3c5ec7819a51ae95c6e8a1a06aa01f669350fe0fd3dd7c4ec8a84dd6b90f24cb192356ca WHIRLPOOL 7f6ad2eb5410cc5e685881654a788807848af026b1277a974682755ab7c9db28f576bfd1576441ea10c5f1e9edb7d30a4a23fb8eccd6d69d86ecc9ce4c9adc7e diff --git a/sys-freebsd/freebsd-usbin/files/freebsd-usbin-10.0-bsdxml2expat.patch b/sys-freebsd/freebsd-usbin/files/freebsd-usbin-10.0-bsdxml2expat.patch new file mode 100644 index 000000000000..a84f96d405b2 --- /dev/null +++ b/sys-freebsd/freebsd-usbin/files/freebsd-usbin-10.0-bsdxml2expat.patch @@ -0,0 +1,24 @@ +diff -Nur work.orig/usr.sbin/ctladm/ctladm.c work/usr.sbin/ctladm/ctladm.c +--- work.orig/usr.sbin/ctladm/ctladm.c 2012-07-12 13:25:58.000000000 +0900 ++++ work/usr.sbin/ctladm/ctladm.c 2012-07-16 05:37:14.000000000 +0900 +@@ -60,7 +60,7 @@ + #include <errno.h> + #include <err.h> + #include <ctype.h> +-#include <bsdxml.h> ++#include <expat.h> + #include <cam/scsi/scsi_all.h> + #include <cam/scsi/scsi_message.h> + #include <cam/ctl/ctl.h> +diff -Nur work.orig/usr.sbin/ctld/kernel.c work/usr.sbin/ctld/kernel.c +--- work.orig/usr.sbin/ctld/kernel.c 2013-09-20 21:55:45.000000000 +0900 ++++ work/usr.sbin/ctld/kernel.c 2013-09-20 22:01:17.000000000 +0900 +@@ -45,7 +45,7 @@ + #include <sys/sbuf.h> + #include <sys/capability.h> + #include <assert.h> +-#include <bsdxml.h> ++#include <expat.h> + #include <ctype.h> + #include <errno.h> + #include <fcntl.h> diff --git a/sys-freebsd/freebsd-usbin/files/freebsd-usbin-7.0-nowrap.patch b/sys-freebsd/freebsd-usbin/files/freebsd-usbin-7.0-nowrap.patch new file mode 100644 index 000000000000..9b11104e8337 --- /dev/null +++ b/sys-freebsd/freebsd-usbin/files/freebsd-usbin-7.0-nowrap.patch @@ -0,0 +1,45 @@ +diff -ur usr.sbin.orig/rpcbind/Makefile usr.sbin/rpcbind/Makefile +--- usr.sbin.orig/rpcbind/Makefile 2007-04-21 12:02:30 +0000 ++++ usr.sbin/rpcbind/Makefile 2007-04-21 12:05:32 +0000 +@@ -8,13 +8,20 @@ + SRCS= check_bound.c rpcb_stat.c rpcb_svc_4.c rpcbind.c pmap_svc.c \ + rpcb_svc.c rpcb_svc_com.c security.c warmstart.c util.c + +-CFLAGS+= -DPORTMAP -DLIBWRAP ++CFLAGS+= -DPORTMAP + + .if ${MK_INET6_SUPPORT} != "no" + CFLAGS+= -DINET6 + .endif + +-DPADD= ${LIBWRAP} ${LIBUTIL} +-LDADD= -lwrap -lutil ++DPADD= ${LIBUTIL} ++LDADD= -lutil ++ ++.if !defined(NO_WRAP) ++CFLAGS+= -DLIBWRAP ++DPADD+= ${LIBWRAP} ++LDADD+= -lwrap ++.endif ++ + + .include <bsd.prog.mk> +diff -ur usr.sbin.orig/ypserv/Makefile usr.sbin/ypserv/Makefile +--- usr.sbin.orig/ypserv/Makefile 2007-04-21 12:02:31 +0000 ++++ usr.sbin/ypserv/Makefile 2007-04-21 12:06:53 +0000 +@@ -8,10 +8,13 @@ + SRCS= yp_svc.c yp_server.c yp_dblookup.c yp_dnslookup.c \ + ypxfr_clnt.c yp.h yp_main.c yp_error.c yp_access.c yp_svc_udp.c + +-CFLAGS+= -DDB_CACHE -DTCP_WRAPPER -I. ++CFLAGS+= -DDB_CACHE -I. + ++.if !defined(NO_WRAP) ++CFLAGS+= -DTCP_WRAPPER + DPADD= ${LIBWRAP} + LDADD= -lwrap ++.endif + + CLEANFILES= yp_svc.c ypxfr_clnt.c yp.h + diff --git a/sys-freebsd/freebsd-usbin/files/freebsd-usbin-8.2-newsyslog.patch b/sys-freebsd/freebsd-usbin/files/freebsd-usbin-8.2-newsyslog.patch new file mode 100644 index 000000000000..a0983912178f --- /dev/null +++ b/sys-freebsd/freebsd-usbin/files/freebsd-usbin-8.2-newsyslog.patch @@ -0,0 +1,10 @@ +--- usr.sbin/newsyslog/pathnames.h.orig 2001-07-30 18:17:17.000000000 +0300 ++++ usr.sbin/newsyslog/pathnames.h 2009-09-11 08:32:57.508226240 +0300 +@@ -24,5 +24,5 @@ + + #define _PATH_CONF "/etc/newsyslog.conf" + #define _PATH_SYSLOGPID _PATH_VARRUN "syslog.pid" +-#define _PATH_BZIP2 "/usr/bin/bzip2" +-#define _PATH_GZIP "/usr/bin/gzip" ++#define _PATH_BZIP2 "/bin/bzip2" ++#define _PATH_GZIP "/bin/gzip" diff --git a/sys-freebsd/freebsd-usbin/files/freebsd-usbin-9.0-libarchive.patch b/sys-freebsd/freebsd-usbin/files/freebsd-usbin-9.0-libarchive.patch new file mode 100644 index 000000000000..bfe479447035 --- /dev/null +++ b/sys-freebsd/freebsd-usbin/files/freebsd-usbin-9.0-libarchive.patch @@ -0,0 +1,12 @@ +--- usr.sbin/bsdinstall/distextract/distextract.c.old 2011-11-02 20:28:08.000000000 +0000 ++++ usr.sbin/bsdinstall/distextract/distextract.c 2011-11-02 20:28:57.000000000 +0000 +@@ -32,6 +32,9 @@ + #include <limits.h> + #include <archive.h> + #include <dialog.h> ++#ifndef archive_read_free ++#define archive_read_free(x) archive_read_finish(x) ++#endif + + static int extract_files(int nfiles, const char **files); + diff --git a/sys-freebsd/freebsd-usbin/files/freebsd-usbin-9.0-newsyslog.patch b/sys-freebsd/freebsd-usbin/files/freebsd-usbin-9.0-newsyslog.patch new file mode 100644 index 000000000000..1d838655c88e --- /dev/null +++ b/sys-freebsd/freebsd-usbin/files/freebsd-usbin-9.0-newsyslog.patch @@ -0,0 +1,12 @@ +diff -uNr usr.sbin/newsyslog.old/pathnames.h usr.sbin/newsyslog/pathnames.h +--- usr.sbin/newsyslog.old/pathnames.h 2011-11-02 20:12:37.000000000 +0000 ++++ usr.sbin/newsyslog/pathnames.h 2011-11-02 20:12:50.000000000 +0000 +@@ -24,6 +24,6 @@ + + #define _PATH_CONF "/etc/newsyslog.conf" + #define _PATH_SYSLOGPID _PATH_VARRUN "syslog.pid" +-#define _PATH_BZIP2 "/usr/bin/bzip2" +-#define _PATH_GZIP "/usr/bin/gzip" ++#define _PATH_BZIP2 "/bin/bzip2" ++#define _PATH_GZIP "/bin/gzip" + #define _PATH_XZ "/usr/bin/xz" diff --git a/sys-freebsd/freebsd-usbin/files/freebsd-usbin-9.1-bsdxml2expat.patch b/sys-freebsd/freebsd-usbin/files/freebsd-usbin-9.1-bsdxml2expat.patch new file mode 100644 index 000000000000..bddc0c77f210 --- /dev/null +++ b/sys-freebsd/freebsd-usbin/files/freebsd-usbin-9.1-bsdxml2expat.patch @@ -0,0 +1,12 @@ +diff -Nur work.orig/usr.sbin/ctladm/ctladm.c work/usr.sbin/ctladm/ctladm.c +--- work.orig/usr.sbin/ctladm/ctladm.c 2012-07-12 13:25:58.000000000 +0900 ++++ work/usr.sbin/ctladm/ctladm.c 2012-07-16 05:37:14.000000000 +0900 +@@ -60,7 +60,7 @@ + #include <errno.h> + #include <err.h> + #include <ctype.h> +-#include <bsdxml.h> ++#include <expat.h> + #include <cam/scsi/scsi_all.h> + #include <cam/scsi/scsi_message.h> + #include <cam/ctl/ctl.h> diff --git a/sys-freebsd/freebsd-usbin/files/freebsd-usbin-9.1-kldxref.patch b/sys-freebsd/freebsd-usbin/files/freebsd-usbin-9.1-kldxref.patch new file mode 100644 index 000000000000..95bd665ded6f --- /dev/null +++ b/sys-freebsd/freebsd-usbin/files/freebsd-usbin-9.1-kldxref.patch @@ -0,0 +1,30 @@ +Index: usr.sbin/kldxref/kldxref.c +=================================================================== +--- usr.sbin/kldxref/kldxref.c (revision 265111) ++++ usr.sbin/kldxref/kldxref.c (working copy) +@@ -274,6 +274,16 @@ usage(void) + exit(1); + } + ++static int ++compare(const FTSENT *const *a, const FTSENT *const *b) ++{ ++ if ((*a)->fts_info == FTS_D && (*b)->fts_info != FTS_D) ++ return 1; ++ if ((*a)->fts_info != FTS_D && (*b)->fts_info == FTS_D) ++ return -1; ++ return strcmp((*a)->fts_name, (*b)->fts_name); ++} ++ + int + main(int argc, char *argv[]) + { +@@ -315,7 +325,7 @@ main(int argc, char *argv[]) + err(1, "%s", argv[0]); + } + +- ftsp = fts_open(argv, fts_options, 0); ++ ftsp = fts_open(argv, fts_options, compare); + if (ftsp == NULL) + exit(1); + diff --git a/sys-freebsd/freebsd-usbin/files/freebsd-usbin-adduser.patch b/sys-freebsd/freebsd-usbin/files/freebsd-usbin-adduser.patch new file mode 100644 index 000000000000..39177b4a987d --- /dev/null +++ b/sys-freebsd/freebsd-usbin/files/freebsd-usbin-adduser.patch @@ -0,0 +1,20 @@ +--- usr.sbin/adduser/adduser.sh.old 2006-10-01 13:41:16 +0000 ++++ usr.sbin/adduser/adduser.sh 2006-10-01 13:41:38 +0000 +@@ -809,7 +809,7 @@ + NOHOME="/nonexistent" + NOLOGIN="nologin" + NOLOGIN_PATH="/usr/sbin/nologin" +-GREPCMD="/usr/bin/grep" ++GREPCMD="/bin/grep" + DATECMD="/bin/date" + + # Set default values +@@ -823,7 +823,7 @@ + uhome= + upass= + ushell= +-udotdir=/usr/share/skel ++udotdir=/etc/skel + ugroups= + uexpire= + upwexpire= diff --git a/sys-freebsd/freebsd-usbin/files/iscsid.initd b/sys-freebsd/freebsd-usbin/files/iscsid.initd new file mode 100755 index 000000000000..dc7aa2980495 --- /dev/null +++ b/sys-freebsd/freebsd-usbin/files/iscsid.initd @@ -0,0 +1,20 @@ +#!/sbin/runscript +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +depend() { + need net +} + +start() { + ebegin "Starting iscsid" + start-stop-daemon --start --quiet --exec \ + /usr/sbin/iscsid -- $iscsidopts + eend $? "Error starting iscsid" +} + +stop() { + ebegin "Stopping iscsid" + start-stop-daemon --stop --quiet --exec /usr/sbin/iscsid + eend $? "Error stopping iscsid" +} diff --git a/sys-freebsd/freebsd-usbin/files/mountd.patch b/sys-freebsd/freebsd-usbin/files/mountd.patch new file mode 100644 index 000000000000..3cb9f03e9d8f --- /dev/null +++ b/sys-freebsd/freebsd-usbin/files/mountd.patch @@ -0,0 +1,15 @@ +http://security.freebsd.org/advisories/FreeBSD-SA-11:01.mountd.asc + +Index: usr.sbin/mountd/mountd.c +=================================================================== +--- usr.sbin/mountd/mountd.c 20 Dec 2010 09:28:28 -0000 1.107 ++++ usr.sbin/mountd/mountd.c 1 Mar 2011 11:47:16 -0000 1.108 +@@ -2875,7 +2875,7 @@ makemask(struct sockaddr_storage *ssp, i + + for (i = 0; i < len; i++) { + bits = (bitlen > CHAR_BIT) ? CHAR_BIT : bitlen; +- *p++ = (1 << bits) - 1; ++ *p++ = (u_char)~0 << (CHAR_BIT - bits); + bitlen -= bits; + } + return 0; diff --git a/sys-freebsd/freebsd-usbin/files/moused.confd b/sys-freebsd/freebsd-usbin/files/moused.confd new file mode 100644 index 000000000000..4d64933683a2 --- /dev/null +++ b/sys-freebsd/freebsd-usbin/files/moused.confd @@ -0,0 +1,20 @@ +# $Id$ + +# See the moused man page for available settings. + +# Set to your mouse device psm[0-9] for PS/2 ports, ums[0-9] for USB ports +# Leave blank to try to autodetect it +MOUSED_DEVICE="" + +# Any additional flags requires +MOUSED_FLAGS="" + +# If 0xd0-0xd3 default range is occupied in your language code table, specify +# alternative range start like MOUSECHAR_START="3", see vidcontrol(1) +MOUSECHAR_START="" + +# You can also multiplex the init script for each device like so +# ln -s moused /etc/init.d/moused.ums0 +# This enables you to have a config file per mouse (forces MOUSED_DEVICE +# to ums0 in this case) and control each mouse. +# devd can also start and stop these mice, which laptop users will find handy. diff --git a/sys-freebsd/freebsd-usbin/files/moused.initd b/sys-freebsd/freebsd-usbin/files/moused.initd new file mode 100644 index 000000000000..f13f5ec12cda --- /dev/null +++ b/sys-freebsd/freebsd-usbin/files/moused.initd @@ -0,0 +1,66 @@ +#!/sbin/runscript +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +MOUSED_NAME=${SVCNAME##*.} +if [ -n "${MOUSED_NAME}" ] && [ ${MOUSED_NAME} != "moused" ] ; then + MOUSED_DEVICE=/dev/"${MOUSED_NAME}" + MOUSED_PIDFILE=/var/run/moused-"${MOUSED_NAME}".pid +else + MOUSED_NAME= + MOUSED_PIDFILE=/var/run/moused.pid +fi + +depend() { + need localmount +} + +start() { + ebegin "Starting the Console Mouse Daemon" "${MOUSED_NAME}" + + if [ -z ${MOUSED_DEVICE} ] ; then + for x in /dev/psm[0-9]* /dev/ums[0-9]* ; do + if [ -e "${x}" ] && \ + [ ! -e /var/run/moused-$(basename "${x}").pid ] ; then + MOUSED_DEVICE=${x} + eindent + einfo "Using mouse on ${MOUSED_DEVICE}" + eoutdent + break + fi + done + fi + + if [ -z "${MOUSED_DEVICE}" ] ; then + eend 1 "No device specified in" "/etc/conf.d/${SVCNAME}" \ + "and no mouse detected" + return 1 + fi + + local opts="${MOUSED_FLAGS} -p ${MOUSED_DEVICE}" + start-stop-daemon --start --quiet --exec /usr/sbin/moused \ + --pidfile "${MOUSED_PIDFILE}" \ + -- ${opts} -I "${MOUSED_PIDFILE}" + local retval=$? + + [ -n "${MOUSE_CHAR_START}" ] && MOUSE_CHAR_START="-M ${MOUSE_CHAR_START}" + local ttyv= + for ttyv in /dev/ttyv* ; do + vidcontrol < "${ttyv}" ${MOUSE_CHAR_START} -m on || retval=1 + done + + eend ${retval} "Failed to start moused" +} + +stop() { + ebegin "Stopping the Console Mouse Daemon" "${MOUSED_NAME}" + # Don't specify the binary as >1 instance of moused may be running + # which is perfectly valid as we can be multiplexed. + start-stop-daemon --stop --exec /usr/sbin/moused \ + --pidfile "${MOUSED_PIDFILE}" + eend $? "Failed to stop moused" +} + +# vim: set ts=4 : + diff --git a/sys-freebsd/freebsd-usbin/files/nfs.confd b/sys-freebsd/freebsd-usbin/files/nfs.confd new file mode 100644 index 000000000000..844252fdc54d --- /dev/null +++ b/sys-freebsd/freebsd-usbin/files/nfs.confd @@ -0,0 +1,10 @@ +# Config file for /etc/init.d/nfs +# Options for nfsd (see man nfsd) +# Example: 8 nfsd servers started: +#nfsdopts="-n 8" + +# Options for mountd (see man mountd) +# Example: allow non-root users to mount shares: +#mountdopts="-n" +# Specify t he exports file, this is the default: +#exportsfile="/etc/exports" diff --git a/sys-freebsd/freebsd-usbin/files/nfs.initd b/sys-freebsd/freebsd-usbin/files/nfs.initd new file mode 100755 index 000000000000..fa54bdb207a5 --- /dev/null +++ b/sys-freebsd/freebsd-usbin/files/nfs.initd @@ -0,0 +1,54 @@ +#!/sbin/runscript +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +#--------------------------------------------------------------------------- +# This script starts/stops nfsd and mountd +# Daemons rpc.rquotad, rpc.rstatd, rpc.rusersd, rpc.rwalld and rpc.sprayd +# should be started from inetd on FreeBSD. +#--------------------------------------------------------------------------- + +extra_started_commands="reload" + +# The binary locations +nfsd=/usr/sbin/nfsd +mountd=/usr/sbin/mountd + +depend() { + use ypbind net rpc.lockd + need rpcbind + after quota +} + +start() { + ebegin "Starting NFS daemon" + start-stop-daemon --start --quiet --exec \ + $nfsd -- ${nfsdopts} + eend $? "Error starting NFS daemon" + + # Start mountd + ebegin "Starting NFS mountd" + start-stop-daemon --start --quiet --exec \ + $mountd -- ${mountdopts} ${exportsfile} + eend $? "Error starting NFS mountd" +} + +stop() { + ebegin "Stopping NFS mountd" + start-stop-daemon --stop --quiet --exec $mountd \ + --pidfile /var/run/mountd.pid + eend $? "Error stopping NFS mountd" + + ebegin "Stopping NFS daemon" + start-stop-daemon --stop --signal USR1 --quiet \ + --name nfsd --user root + eend $? "Error stopping NFS daemon" +} + +reload() { + # Hangup signal to mountd reloads /etc/exports. + ebegin "Reloading /etc/exports" + start-stop-daemon --signal 1 --quiet --exec $mountd \ + --pidfile /var/run/mountd.pid + eend $? +} diff --git a/sys-freebsd/freebsd-usbin/files/nfsmount.initd b/sys-freebsd/freebsd-usbin/files/nfsmount.initd new file mode 100755 index 000000000000..dfa9a101dc8d --- /dev/null +++ b/sys-freebsd/freebsd-usbin/files/nfsmount.initd @@ -0,0 +1,63 @@ +#!/sbin/runscript +# Copyright 1999-2004 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +depend() { + need net rpcbind + use ypbind +} + +start_statd() { + # Don't start rpc.statd if already started by init.d/nfs + killall -0 rpc.statd 2>/dev/null && return 0 + ebegin "Starting NFS statd" + rpc.statd + eend $? "Error starting NFS statd" +} + +stop_statd() { + # Don't stop rpc.statd if it's in use by init.d/nfs + killall -0 nfsd 2>/dev/null && return 0 + # Make sure it's actually running + killall -0 rpc.statd 2>/dev/null || return 0 + # Okay, all tests passed, stop rpc.statd + ebegin "Stopping NFS statd" + killall rpc.statd + eend $? "Error stopping NFS statd" +} + +start_lockd() { + # Don't start rpc.lockd if already started by init.d/nfs + killall -0 rpc.lockd 2>/dev/null && return 0 + ebegin "Starting NFS lockd" + rpc.lockd + eend $? "Error starting NFS lockd" +} + +stop_lockd() { + # Don't stop rpc.lockd if it's in use by init.d/nfs + killall -0 nfsd 2>/dev/null && return 0 + # Make sure it's actually running + killall -0 rpc.lockd 2>/dev/null || return 0 + # Okay, all tests passed, stop rpc.lockd + ebegin "Stopping NFS lockd" + killall rpc.lockd + eend $? "Error stopping NFS lockd" +} + +start() { + start_statd + start_lockd + ebegin "Mounting NFS filesystems" + mount -a -t nfs + eend $? "Error mounting NFS filesystems" +} + +stop() { + ebegin "Unmounting NFS filesystems" + umount -a -t nfs + eend $? "Error unmounting NFS filesystems" + stop_statd + stop_lockd +} diff --git a/sys-freebsd/freebsd-usbin/files/nfsuserd.confd b/sys-freebsd/freebsd-usbin/files/nfsuserd.confd new file mode 100644 index 000000000000..f8f3ea1e31de --- /dev/null +++ b/sys-freebsd/freebsd-usbin/files/nfsuserd.confd @@ -0,0 +1,5 @@ +# Config file for /etc/init.d/nfsuserd +# Options for nfsuserd (see man nfsuserd) +# Example: set domain example.com: +#nfsuserdopts="-domain example.com" + diff --git a/sys-freebsd/freebsd-usbin/files/nfsuserd.initd b/sys-freebsd/freebsd-usbin/files/nfsuserd.initd new file mode 100755 index 000000000000..1d7bf0029511 --- /dev/null +++ b/sys-freebsd/freebsd-usbin/files/nfsuserd.initd @@ -0,0 +1,20 @@ +#!/sbin/runscript +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +depend() { + need net nfs +} + +start() { + ebegin "Starting nfsuserd" + start-stop-daemon --start --quiet --exec \ + /usr/sbin/nfsuserd -- $nfsuserdopts + eend $? "Error starting nfsuserd" +} + +stop() { + ebegin "Stopping nfsuserd" + start-stop-daemon --stop --quiet --exec /usr/sbin/nfsuserd + eend $? "Error stopping nfsuserd" +} diff --git a/sys-freebsd/freebsd-usbin/files/powerd.confd b/sys-freebsd/freebsd-usbin/files/powerd.confd new file mode 100644 index 000000000000..e5db5a1a34ef --- /dev/null +++ b/sys-freebsd/freebsd-usbin/files/powerd.confd @@ -0,0 +1,14 @@ +# Copyright 2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +# Mode allowed: maximum, minimum, adaptive +# Default unless specified is adaptive + +AC_MODE="maximum" + +#BATTERY_MODE="minimum" + +POWERD_OPTS="" + + diff --git a/sys-freebsd/freebsd-usbin/files/powerd.initd b/sys-freebsd/freebsd-usbin/files/powerd.initd new file mode 100755 index 000000000000..293041791747 --- /dev/null +++ b/sys-freebsd/freebsd-usbin/files/powerd.initd @@ -0,0 +1,27 @@ +#!/sbin/runscript +# Copyright 2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +depend() { + need localmount +} + +start() { + local args= + [ -n "${BATTERY_MODE}" ] && args="${args} -b ${BATTERY_MODE}" + [ -n "${AC_MODE}" ] && args="${args} -a ${AC_MODE}" + + ebegin "Starting Power Control Daemon" + start-stop-daemon --start --exec /usr/sbin/powerd \ + --pidfile /var/run/powerd.pid \ + -- ${args} ${POWERD_OPTS} + eend $? "Failed to start powerd" +} + +stop() { + ebegin "Stopping Power Control Daemon" + start-stop-daemon --stop --exec /usr/sbin/powerd \ + --pidfile /var/run/powerd.pid + eend $? "Failed to stop powerd" +} diff --git a/sys-freebsd/freebsd-usbin/files/pw.conf b/sys-freebsd/freebsd-usbin/files/pw.conf new file mode 100644 index 000000000000..29a246f72b8f --- /dev/null +++ b/sys-freebsd/freebsd-usbin/files/pw.conf @@ -0,0 +1,5 @@ +# Change this to Gentoo's Default, instead of FreeBSD's default of +# /usr/share/skel, so that bash and other packages installs the files on the +# right place. +skeleton /etc/skel + diff --git a/sys-freebsd/freebsd-usbin/files/rarpd.confd b/sys-freebsd/freebsd-usbin/files/rarpd.confd new file mode 100644 index 000000000000..b56fdd51c8cc --- /dev/null +++ b/sys-freebsd/freebsd-usbin/files/rarpd.confd @@ -0,0 +1,7 @@ +# $Id$ + +# Configuration file for /etc/init.d/rarpd + +# To start rarpd only for a given interface, set the +# following variable +# RARPD_ONLY_INTERFACE="rl0" diff --git a/sys-freebsd/freebsd-usbin/files/rarpd.initd b/sys-freebsd/freebsd-usbin/files/rarpd.initd new file mode 100644 index 000000000000..eef661657e73 --- /dev/null +++ b/sys-freebsd/freebsd-usbin/files/rarpd.initd @@ -0,0 +1,35 @@ +#!/sbin/runscript +# Copyright 2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +depend() { + if [ -z "${RARPD_ONLY_INTERFACE}" ]; then + need net + else + need net."${RARPD_ONLY_INTERFACE}" + fi +} + +start() { + local rarpd_opts + + if [ -z "${RARPD_ONLY_INTERFACE}" ]; then + rarpd_opts="${rarpd_opts} -a" + else + rarpd_opts="${rarpd_opts} ${RARPD_ONLY_INTERFACE}" + fi + + ebegin "Starting reverse ARP daemon" + start-stop-daemon --start --background \ + --pidfile /var/run/rarpd.pid --make-pidfile \ + --exec /usr/sbin/rarpd -- -f ${rarpd_opts} + eend $? +} + +stop() { + ebegin "Stopping reverse ARP daemon" + start-stop-daemon --stop --pidfile /var/run/rarpd.pid \ + --exec /usr/sbin/rarpd -- ${rarpd_opts} + eend $? +} diff --git a/sys-freebsd/freebsd-usbin/files/rpc.lockd.initd b/sys-freebsd/freebsd-usbin/files/rpc.lockd.initd new file mode 100755 index 000000000000..0c74b9fed612 --- /dev/null +++ b/sys-freebsd/freebsd-usbin/files/rpc.lockd.initd @@ -0,0 +1,20 @@ +#!/sbin/runscript +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +depend() { + need net rpcbind rpc.statd +} + +start() { + ebegin "Starting NFS lockd" + start-stop-daemon --start --quiet --exec \ + /usr/sbin/rpc.lockd -- $rpclockdopts + eend $? "Error starting NFS lockd" +} + +stop() { + ebegin "Stopping NFS lockd" + start-stop-daemon --stop --quiet --exec /usr/sbin/rpc.lockd + eend $? "Error stopping NFS lockd" +} diff --git a/sys-freebsd/freebsd-usbin/files/rpc.statd.initd b/sys-freebsd/freebsd-usbin/files/rpc.statd.initd new file mode 100755 index 000000000000..5c3cf30d304f --- /dev/null +++ b/sys-freebsd/freebsd-usbin/files/rpc.statd.initd @@ -0,0 +1,20 @@ +#!/sbin/runscript +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +depend() { + need net rpcbind +} + +start() { + ebegin "Starting NFS statd" + start-stop-daemon --start --quiet --exec \ + /usr/sbin/rpc.statd -- $rpcstatdopts + eend $? "Error starting NFS statd" +} + +stop() { + ebegin "Stopping NFS statd" + start-stop-daemon --stop --quiet --exec /usr/sbin/rpc.statd + eend $? "Error stopping NFS statd" +} diff --git a/sys-freebsd/freebsd-usbin/files/rpcbind.initd b/sys-freebsd/freebsd-usbin/files/rpcbind.initd new file mode 100755 index 000000000000..47cb0d359342 --- /dev/null +++ b/sys-freebsd/freebsd-usbin/files/rpcbind.initd @@ -0,0 +1,30 @@ +#!/sbin/runscript +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +depend() { + need localmount + use net + before inetd + before xinetd +} + +start() { + ebegin "Starting rpcbind" + start-stop-daemon --start --exec /usr/sbin/rpcbind + local ret=$? + eend ${ret} + + # without, if a service depending on portmap is started too fast, + # connecting to portmap will fail -- azarah + # doing that for rpcbind, too -- flameeyes + sleep 1 + return ${ret} +} + +stop() { + ebegin "Stopping rpcbind" + start-stop-daemon --stop --exec /usr/sbin/rpcbind + eend $? +} diff --git a/sys-freebsd/freebsd-usbin/files/syscons.confd b/sys-freebsd/freebsd-usbin/files/syscons.confd new file mode 100644 index 000000000000..7ba81ff47a1b --- /dev/null +++ b/sys-freebsd/freebsd-usbin/files/syscons.confd @@ -0,0 +1,14 @@ +# $Id$ +# Example syscons config file. This is the place to set things like keymap, etc. + +# Set the keymap to "uk.iso". +#KEYMAP="uk.iso" + +# Set the keyboard rate to 250ms delay, and 34 repeat rate. +#KEYRATE="250.34" + +# Change the behaviour of F-unction keys (see kbdcontrol(1)). +#KEYCHANGE="10 'ssh myhost'" + +# See vidcontrol(1) -t +#BLANKTIME="off" diff --git a/sys-freebsd/freebsd-usbin/files/syscons.initd b/sys-freebsd/freebsd-usbin/files/syscons.initd new file mode 100755 index 000000000000..7edcafa332d7 --- /dev/null +++ b/sys-freebsd/freebsd-usbin/files/syscons.initd @@ -0,0 +1,78 @@ +#!/sbin/runscript +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +depend() { + need localmount +} + +start() { + ebegin "Configuring system console" + + if [ -n "${MODE}" ] ; then + einfo "Setting mode to ${MODE}" + vidcontrol "${MODE}" + eend $? + fi + + # XXX: This should handle serial consoles. + + # Set the keymap. + if [ -n "${KEYMAP}" ]; then + einfo "Setting keymap to" "${KEYMAP}" + kbdcontrol -l ${KEYMAP} < /dev/console + fi + + if [ -n "${KEYRATE}" ]; then + einfo "Setting keyrate to" "${KEYRATE}" + kbdcontrol -r ${KEYRATE} < /dev/console + fi + + if [ -n "${KEYCHANGE}" ]; then + einfo "Changing function keys..." + eval set -- "${KEYCHANGE}" + eindent + while [ $# -gt 0 ] ; do + veinfo "F$1 -> \`$2'" + kbdcontrol -f "$1" "$2" < /dev/console + shift ; shift + done + eoutdent + fi + + if [ -n "${CURSOR}" ]; then + einfo "Setting cursor" + vidcontrol -c ${CURSOR} + fi + + einfo "Setting custom fonts..." + # Nothing to see here, move along... + for v in FONT8x16 FONT8x14 FONT8x8; do + f=$(eval \$"${v}") + if [ -n "${f}" ]; then + vidcontrol -f ${v##FONT} ${f} + fi + done + + if [ -n "${BLANKTIME}" ]; then + einfo "Setting blanktime" + vidcontrol -t ${BLANKTIME} + fi + + if [ -n "${SAVER}" ]; then + for i in `kldstat | awk '$5 ~ "^splash_.*$" { print $5 }'`; do + kldunload ${i} + done + kldstat -v | grep -q _saver || kldload ${SAVER}_saver + fi + + if [ -n "${KBDFLAGS}" ]; then + einfo "Setting keyboard flags for all screens" + for ttyv in /dev/ttyv*; do + kbdcontrol ${KBDFLAGS} <${ttyv} >${ttyv} 2>&1 + done + fi + + eend 0 +} diff --git a/sys-freebsd/freebsd-usbin/files/syslogd.initd b/sys-freebsd/freebsd-usbin/files/syslogd.initd new file mode 100755 index 000000000000..4367b40ec4ea --- /dev/null +++ b/sys-freebsd/freebsd-usbin/files/syslogd.initd @@ -0,0 +1,25 @@ +#!/sbin/runscript +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +depend() { + provide logger + need localmount +} + +start() { + ebegin "Starting System Logger" + start-stop-daemon --start --quiet --exec /usr/sbin/syslogd \ + -- ${SYSLOGD_OPTS} + eend $? +} + +stop() { + ebegin "Stopping System Logger" + start-stop-daemon --stop --quiet --pidfile /var/run/syslog.pid + eend $? +} + + + diff --git a/sys-freebsd/freebsd-usbin/freebsd-usbin-10.1.ebuild b/sys-freebsd/freebsd-usbin/freebsd-usbin-10.1.ebuild new file mode 100644 index 000000000000..42db3781d3e8 --- /dev/null +++ b/sys-freebsd/freebsd-usbin/freebsd-usbin-10.1.ebuild @@ -0,0 +1,183 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit bsdmk freebsd flag-o-matic eutils + +DESCRIPTION="FreeBSD /usr/sbin tools" +SLOT="0" + +if [[ ${PV} != *9999* ]]; then + KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd" +fi + +EXTRACTONLY=" + usr.sbin/ + contrib/ + usr.bin/ + lib/ + sbin/ + etc/ + gnu/ +" +use nis && EXTRACTONLY+="libexec/" +if use build ; then + EXTRACTONLY+=" + sys/ + include/ + " +fi + +RDEPEND="=sys-freebsd/freebsd-lib-${RV}*[usb?,bluetooth?,netware?] + =sys-freebsd/freebsd-libexec-${RV}* + build? ( sys-apps/baselayout ) + ssl? ( dev-libs/openssl ) + >=app-arch/libarchive-3 + sys-apps/tcp-wrappers + dev-util/dialog + >=dev-libs/libedit-20120311.3.0-r1 + net-libs/libpcap + kerberos? ( app-crypt/heimdal )" +DEPEND="${RDEPEND} + =sys-freebsd/freebsd-mk-defs-${RV}* + =sys-freebsd/freebsd-ubin-${RV}* + !build? ( =sys-freebsd/freebsd-sources-${RV}* ) + sys-apps/texinfo + sys-devel/flex" + +S="${WORKDIR}/usr.sbin" + +IUSE="acpi atm audit bluetooth floppy ipv6 kerberos minimal netware nis pam ssl usb build" + +pkg_setup() { + # Release crunch is something like minimal. It seems to remove everything + # which is not needed to work. + use minimal && mymakeopts="${mymakeopts} RELEASE_CRUNCH= " + + use acpi || mymakeopts="${mymakeopts} WITHOUT_ACPI= " + use atm || mymakeopts="${mymakeopts} WITHOUT_ATM= " + use audit || mymakeopts="${mymakeopts} WITHOUT_AUDIT= " + use bluetooth || mymakeopts="${mymakeopts} WITHOUT_BLUETOOTH= " + use ipv6 || mymakeopts="${mymakeopts} WITHOUT_INET6= WITHOUT_INET6_SUPPORT= " + use netware || mymakeopts="${mymakeopts} WITHOUT_IPX= WITHOUT_IPX_SUPPORT= WITHOUT_NCP= " + use nis || mymakeopts="${mymakeopts} WITHOUT_NIS= " + use pam || mymakeopts="${mymakeopts} WITHOUT_PAM_SUPPORT= " + use ssl || mymakeopts="${mymakeopts} WITHOUT_OPENSSL= " + use usb || mymakeopts="${mymakeopts} WITHOUT_USB= " + use floppy || mymakeopts="${mymakeopts} WITHOUT_FLOPPY= " + use kerberos || mymakeopts="${mymakeopts} WITHOUT_GSSAPI= " + + mymakeopts="${mymakeopts} WITHOUT_PF= WITHOUT_LPR= WITHOUT_SENDMAIL= WITHOUT_AUTHPF= WITHOUT_MAILWRAPPER= WITHOUT_UNBOUND= " + + append-flags $(test-flags -fno-strict-aliasing) +} + +PATCHES=( + "${FILESDIR}/${PN}-adduser.patch" + "${FILESDIR}/${PN}-9.0-newsyslog.patch" + "${FILESDIR}/${PN}-10.0-bsdxml2expat.patch" + ) + +REMOVE_SUBDIRS=" + tcpdchk tcpdmatch + sendmail praliases editmap mailstats makemap + pc-sysinstall cron mailwrapper ntp bsnmpd + tcpdump ndp inetd + wpa/wpa_supplicant wpa/hostapd wpa/hostapd_cli wpa/wpa_cli wpa/wpa_passphrase + zic amd + pkg pkg_install freebsd-update service sysrc" + +src_prepare() { + if ! use build; then + [[ ! -e "${WORKDIR}/sys" ]] && ln -s "/usr/src/sys" "${WORKDIR}/sys" + [[ ! -e "${WORKDIR}/include" ]] && ln -s "/usr/include" "${WORKDIR}/include" + else + dummy_mk mount_smbfs + fi + # Don't install mtree format manpage + # it's installed by libarchive. + sed -e "s: mtree.5::g" -i "${S}"/mtree/Makefile +} + +src_compile() { + # Preparing to build nmtree + cd "${WORKDIR}/lib/libnetbsd" + freebsd_src_compile + + cd "${S}" + freebsd_src_compile +} + +src_install() { + # By creating these directories we avoid having to do a + # more complex hack + dodir /usr/share/doc + dodir /sbin + dodir /usr/libexec + dodir /usr/bin + + # FILESDIR is used by some makefiles which will install files + # in the wrong place, just put it in the doc directory. + mkinstall DOCDIR=/usr/share/doc/${PF} || die "Install failed" + + # Most of these now come from openrc. + for util in iscsid nfs nfsuserd rpc.statd rpc.lockd; do + newinitd "${FILESDIR}/"${util}.initd ${util} || die + if [[ -e "${FILESDIR}"/${util}.confd ]]; then \ + newconfd "${FILESDIR}"/${util}.confd ${util} || die + fi + done + + for class in daily monthly weekly; do + cat - > "${T}/periodic.${class}" <<EOS +#!/bin/sh +/usr/sbin/periodic ${class} +EOS + exeinto /etc/cron.${class} + newexe "${T}/periodic.${class}" periodic + done + + # Install the pw.conf file to let pw use Gentoo's skel location + insinto /etc + doins "${FILESDIR}/pw.conf" || die + + cd "${WORKDIR}/etc" + doins apmd.conf syslog.conf newsyslog.conf nscd.conf || die + + insinto /etc/ppp + doins ppp/ppp.conf || die + + if use bluetooth; then + insinto /etc/bluetooth + doins bluetooth/* || die + rm -f "${D}"/etc/bluetooth/Makefile + fi + + # Install the periodic stuff (needs probably to be ported in a more + # gentooish way) + cd "${WORKDIR}/etc/periodic" + + doperiodic daily daily/*.accounting + doperiodic monthly monthly/*.accounting +} + +pkg_postinst() { + # We need to run pwd_mkdb if key files are not present + # If they are, then there is no need to run pwd_mkdb + if [[ ! -e "${ROOT}etc/passwd" || ! -e "${ROOT}etc/pwd.db" || ! -e "${ROOT}etc/spwd.db" ]] ; then + if [[ -e "${ROOT}etc/master.passwd" ]] ; then + einfo "Generating passwd files from ${ROOT}etc/master.passwd" + "${ROOT}"usr/sbin/pwd_mkdb -p -d "${ROOT}etc" "${ROOT}etc/master.passwd" + else + eerror "${ROOT}etc/master.passwd does not exist!" + eerror "You will no be able to log into your system!" + fi + fi + + for logfile in messages security auth.log maillog lpd-errs xferlog cron \ + debug.log slip.log ppp.log; do + [[ -f "${ROOT}/var/log/${logfile}" ]] || touch "${ROOT}/var/log/${logfile}" + done +} diff --git a/sys-freebsd/freebsd-usbin/freebsd-usbin-8.2-r2.ebuild b/sys-freebsd/freebsd-usbin/freebsd-usbin-8.2-r2.ebuild new file mode 100644 index 000000000000..6e3c279bfe74 --- /dev/null +++ b/sys-freebsd/freebsd-usbin/freebsd-usbin-8.2-r2.ebuild @@ -0,0 +1,163 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=2 + +inherit bsdmk freebsd flag-o-matic eutils + +DESCRIPTION="FreeBSD /usr/sbin tools" +SLOT="0" +KEYWORDS="~sparc-fbsd ~x86-fbsd" + +SRC_URI="mirror://gentoo/${P}.tar.bz2 + mirror://gentoo/${CONTRIB}.tar.bz2 + mirror://gentoo/${UBIN}.tar.bz2 + mirror://gentoo/${LIB}.tar.bz2 + mirror://gentoo/${SBIN}.tar.bz2 + mirror://gentoo/${ETC}.tar.bz2 + mirror://gentoo/${GNU}.tar.bz2 + nis? ( mirror://gentoo/${LIBEXEC}.tar.bz2 ) + build? ( mirror://gentoo/${SYS}.tar.bz2 + mirror://gentoo/${INCLUDE}.tar.bz2 )" + +RDEPEND="=sys-freebsd/freebsd-lib-${RV}*[usb?,bluetooth?,netware?] + =sys-freebsd/freebsd-libexec-${RV}* + acpi? ( sys-power/iasl ) + build? ( sys-apps/baselayout ) + ssl? ( dev-libs/openssl ) + dev-libs/libelf + dev-libs/libedit + net-libs/libpcap" +DEPEND="${RDEPEND} + =sys-freebsd/freebsd-mk-defs-${RV}* + =sys-freebsd/freebsd-ubin-${RV}* + !build? ( =sys-freebsd/freebsd-sources-${RV}* ) + sys-apps/texinfo + sys-devel/flex" + +S="${WORKDIR}/usr.sbin" + +IUSE="acpi atm audit bluetooth floppy ipv6 minimal netware nis pam ssl usb build" + +pkg_setup() { + # Release crunch is something like minimal. It seems to remove everything + # which is not needed to work. + use minimal && mymakeopts="${mymakeopts} RELEASE_CRUNCH= " + + use acpi || mymakeopts="${mymakeopts} WITHOUT_ACPI= " + use atm || mymakeopts="${mymakeopts} WITHOUT_ATM= " + use audit || mymakeopts="${mymakeopts} WITHOUT_AUDIT= " + use bluetooth || mymakeopts="${mymakeopts} WITHOUT_BLUETOOTH= " + use ipv6 || mymakeopts="${mymakeopts} WITHOUT_INET6= WITHOUT_INET6_SUPPORT= " + use netware || mymakeopts="${mymakeopts} WITHOUT_IPX= WITHOUT_IPX_SUPPORT= WITHOUT_NCP= " + use nis || mymakeopts="${mymakeopts} WITHOUT_NIS= " + use pam || mymakeopts="${mymakeopts} WITHOUT_PAM_SUPPORT= " + use ssl || mymakeopts="${mymakeopts} WITHOUT_OPENSSL= " + use usb || mymakeopts="${mymakeopts} WITHOUT_USB= " + use floppy || mymakeopts="${mymakeopts} WITHOUT_FLOPPY= " + + mymakeopts="${mymakeopts} WITHOUT_BIND_NAMED= WITHOUT_BIND_DNSSEC= WITHOUT_PF= WITHOUT_LPR= WITHOUT_SENDMAIL= WITHOUT_AUTHPF= WITHOUT_MAILWRAPPER= " + + append-flags $(test-flags -fno-strict-aliasing) +} + +PATCHES=( "${FILESDIR}/${PN}-7.0-nowrap.patch" + "${FILESDIR}/${PN}-adduser.patch" + "${FILESDIR}/mountd.patch" + "${FILESDIR}/${PN}-8.2-newsyslog.patch" ) + +REMOVE_SUBDIRS=" + named named-checkzone named-checkconf rndc rndc-confgen + dnssec-keygen dnssec-signzone + tcpdchk tcpdmatch + sendmail praliases editmap mailstats makemap + sysinstall cron mailwrapper ntp bsnmpd + tcpdump ndp inetd + wpa/wpa_supplicant wpa/hostapd wpa/hostapd_cli wpa/wpa_cli wpa/wpa_passphrase + zic amd + pkg_install freebsd-update" + +src_prepare() { + if ! use build; then + ln -s "/usr/src/sys-${RV}" "${WORKDIR}/sys" + ln -s "/usr/include" "${WORKDIR}/include" + else + dummy_mk mount_smbfs + fi + # Don't install mtree format manpage + # it's installed by libarchive. + sed -e "s: mtree.5::g" -i "${S}"/mtree/Makefile +} + +src_install() { + # By creating these directories we avoid having to do a + # more complex hack + dodir /usr/share/doc + dodir /sbin + dodir /usr/libexec + dodir /usr/bin + + # FILESDIR is used by some makefiles which will install files + # in the wrong place, just put it in the doc directory. + mkinstall DOCDIR=/usr/share/doc/${PF} || die "Install failed" + + # Most of these now come from openrc. + for util in nfs rpc.statd rpc.lockd; do + newinitd "${FILESDIR}/"${util}.initd ${util} || die + if [[ -e "${FILESDIR}"/${util}.confd ]]; then \ + newconfd "${FILESDIR}"/${util}.confd ${util} || die + fi + done + + for class in daily monthly weekly; do + cat - > "${T}/periodic.${class}" <<EOS +#!/bin/sh +/usr/sbin/periodic ${class} +EOS + exeinto /etc/cron.${class} + newexe "${T}/periodic.${class}" periodic + done + + # Install the pw.conf file to let pw use Gentoo's skel location + insinto /etc + doins "${FILESDIR}/pw.conf" || die + + cd "${WORKDIR}/etc" + doins apmd.conf syslog.conf newsyslog.conf nscd.conf || die + + insinto /etc/ppp + doins ppp/ppp.conf || die + + if use bluetooth; then + insinto /etc/bluetooth + doins bluetooth/* || die + rm -f "${D}"/etc/bluetooth/Makefile + fi + + # Install the periodic stuff (needs probably to be ported in a more + # gentooish way) + cd "${WORKDIR}/etc/periodic" + + doperiodic daily daily/*.accounting + doperiodic monthly monthly/*.accounting +} + +pkg_postinst() { + # We need to run pwd_mkdb if key files are not present + # If they are, then there is no need to run pwd_mkdb + if [[ ! -e "${ROOT}etc/passwd" || ! -e "${ROOT}etc/pwd.db" || ! -e "${ROOT}etc/spwd.db" ]] ; then + if [[ -e "${ROOT}etc/master.passwd" ]] ; then + einfo "Generating passwd files from ${ROOT}etc/master.passwd" + "${ROOT}"usr/sbin/pwd_mkdb -p -d "${ROOT}etc" "${ROOT}etc/master.passwd" + else + eerror "${ROOT}etc/master.passwd does not exist!" + eerror "You will no be able to log into your system!" + fi + fi + + for logfile in messages security auth.log maillog lpd-errs xferlog cron \ + debug.log slip.log ppp.log; do + [[ -f "${ROOT}/var/log/${logfile}" ]] || touch "${ROOT}/var/log/${logfile}" + done +} diff --git a/sys-freebsd/freebsd-usbin/freebsd-usbin-9.1-r1.ebuild b/sys-freebsd/freebsd-usbin/freebsd-usbin-9.1-r1.ebuild new file mode 100644 index 000000000000..79209152bda6 --- /dev/null +++ b/sys-freebsd/freebsd-usbin/freebsd-usbin-9.1-r1.ebuild @@ -0,0 +1,171 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=2 + +inherit bsdmk freebsd flag-o-matic eutils + +DESCRIPTION="FreeBSD /usr/sbin tools" +SLOT="0" +KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd" + +SRC_URI="mirror://gentoo/${P}.tar.bz2 + mirror://gentoo/${CONTRIB}.tar.bz2 + mirror://gentoo/${UBIN}.tar.bz2 + mirror://gentoo/${LIB}.tar.bz2 + mirror://gentoo/${SBIN}.tar.bz2 + mirror://gentoo/${ETC}.tar.bz2 + mirror://gentoo/${GNU}.tar.bz2 + nis? ( mirror://gentoo/${LIBEXEC}.tar.bz2 ) + build? ( mirror://gentoo/${SYS}.tar.bz2 + mirror://gentoo/${INCLUDE}.tar.bz2 )" + +RDEPEND="=sys-freebsd/freebsd-lib-${RV}*[usb?,bluetooth?,netware?] + =sys-freebsd/freebsd-libexec-${RV}* + =sys-freebsd/freebsd-contrib-${RV}* + acpi? ( sys-power/iasl ) + build? ( sys-apps/baselayout ) + ssl? ( dev-libs/openssl ) + >=app-arch/libarchive-3 + sys-apps/tcp-wrappers + dev-util/dialog + dev-libs/libelf + >=dev-libs/libedit-20120311.3.0-r1 + net-libs/libpcap + kerberos? ( app-crypt/heimdal )" +DEPEND="${RDEPEND} + =sys-freebsd/freebsd-mk-defs-${RV}* + =sys-freebsd/freebsd-ubin-${RV}* + !build? ( =sys-freebsd/freebsd-sources-${RV}* ) + sys-apps/texinfo + sys-devel/flex" + +S="${WORKDIR}/usr.sbin" + +IUSE="acpi atm audit bluetooth floppy ipv6 kerberos minimal netware nis pam ssl usb build" + +pkg_setup() { + # Release crunch is something like minimal. It seems to remove everything + # which is not needed to work. + use minimal && mymakeopts="${mymakeopts} RELEASE_CRUNCH= " + + use acpi || mymakeopts="${mymakeopts} WITHOUT_ACPI= " + use atm || mymakeopts="${mymakeopts} WITHOUT_ATM= " + use audit || mymakeopts="${mymakeopts} WITHOUT_AUDIT= " + use bluetooth || mymakeopts="${mymakeopts} WITHOUT_BLUETOOTH= " + use ipv6 || mymakeopts="${mymakeopts} WITHOUT_INET6= WITHOUT_INET6_SUPPORT= " + use netware || mymakeopts="${mymakeopts} WITHOUT_IPX= WITHOUT_IPX_SUPPORT= WITHOUT_NCP= " + use nis || mymakeopts="${mymakeopts} WITHOUT_NIS= " + use pam || mymakeopts="${mymakeopts} WITHOUT_PAM_SUPPORT= " + use ssl || mymakeopts="${mymakeopts} WITHOUT_OPENSSL= " + use usb || mymakeopts="${mymakeopts} WITHOUT_USB= " + use floppy || mymakeopts="${mymakeopts} WITHOUT_FLOPPY= " + use kerberos || mymakeopts="${mymakeopts} WITHOUT_GSSAPI= " + + mymakeopts="${mymakeopts} WITHOUT_BIND_NAMED= WITHOUT_BIND_DNSSEC= WITHOUT_PF= WITHOUT_LPR= WITHOUT_SENDMAIL= WITHOUT_AUTHPF= WITHOUT_MAILWRAPPER= " + + append-flags $(test-flags -fno-strict-aliasing) +} + +PATCHES=( + "${FILESDIR}/${PN}-adduser.patch" + "${FILESDIR}/${PN}-9.0-newsyslog.patch" + "${FILESDIR}/${PN}-9.1-bsdxml2expat.patch" + "${FILESDIR}/${PN}-9.1-kldxref.patch" + ) + +REMOVE_SUBDIRS=" + named named-checkzone named-checkconf rndc rndc-confgen + dnssec-keygen dnssec-signzone + tcpdchk tcpdmatch + sendmail praliases editmap mailstats makemap + sysinstall cron mailwrapper ntp bsnmpd + tcpdump ndp inetd + wpa/wpa_supplicant wpa/hostapd wpa/hostapd_cli wpa/wpa_cli wpa/wpa_passphrase + zic amd + pkg pkg_install freebsd-update service" + +src_prepare() { + if ! use build; then + ln -s "/usr/src/sys-${RV}" "${WORKDIR}/sys" + ln -s "/usr/include" "${WORKDIR}/include" + else + dummy_mk mount_smbfs + fi + # Don't install mtree format manpage + # it's installed by libarchive. + sed -e "s: mtree.5::g" -i "${S}"/mtree/Makefile +} + +src_install() { + # By creating these directories we avoid having to do a + # more complex hack + dodir /usr/share/doc + dodir /sbin + dodir /usr/libexec + dodir /usr/bin + + # FILESDIR is used by some makefiles which will install files + # in the wrong place, just put it in the doc directory. + mkinstall DOCDIR=/usr/share/doc/${PF} || die "Install failed" + + # Most of these now come from openrc. + for util in nfs rpc.statd rpc.lockd; do + newinitd "${FILESDIR}/"${util}.initd ${util} || die + if [[ -e "${FILESDIR}"/${util}.confd ]]; then \ + newconfd "${FILESDIR}"/${util}.confd ${util} || die + fi + done + + for class in daily monthly weekly; do + cat - > "${T}/periodic.${class}" <<EOS +#!/bin/sh +/usr/sbin/periodic ${class} +EOS + exeinto /etc/cron.${class} + newexe "${T}/periodic.${class}" periodic + done + + # Install the pw.conf file to let pw use Gentoo's skel location + insinto /etc + doins "${FILESDIR}/pw.conf" || die + + cd "${WORKDIR}/etc" + doins apmd.conf syslog.conf newsyslog.conf nscd.conf || die + + insinto /etc/ppp + doins ppp/ppp.conf || die + + if use bluetooth; then + insinto /etc/bluetooth + doins bluetooth/* || die + rm -f "${D}"/etc/bluetooth/Makefile + fi + + # Install the periodic stuff (needs probably to be ported in a more + # gentooish way) + cd "${WORKDIR}/etc/periodic" + + doperiodic daily daily/*.accounting + doperiodic monthly monthly/*.accounting +} + +pkg_postinst() { + # We need to run pwd_mkdb if key files are not present + # If they are, then there is no need to run pwd_mkdb + if [[ ! -e "${ROOT}etc/passwd" || ! -e "${ROOT}etc/pwd.db" || ! -e "${ROOT}etc/spwd.db" ]] ; then + if [[ -e "${ROOT}etc/master.passwd" ]] ; then + einfo "Generating passwd files from ${ROOT}etc/master.passwd" + "${ROOT}"usr/sbin/pwd_mkdb -p -d "${ROOT}etc" "${ROOT}etc/master.passwd" + else + eerror "${ROOT}etc/master.passwd does not exist!" + eerror "You will no be able to log into your system!" + fi + fi + + for logfile in messages security auth.log maillog lpd-errs xferlog cron \ + debug.log slip.log ppp.log; do + [[ -f "${ROOT}/var/log/${logfile}" ]] || touch "${ROOT}/var/log/${logfile}" + done +} diff --git a/sys-freebsd/freebsd-usbin/metadata.xml b/sys-freebsd/freebsd-usbin/metadata.xml new file mode 100644 index 000000000000..77bc580d775b --- /dev/null +++ b/sys-freebsd/freebsd-usbin/metadata.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <herd>bsd</herd> + <use> + <flag name='floppy'>Enable floppy disk utilities (fdcontrol, fdformat, fdread, fdwrite).</flag> + <flag name='audit'> + Build auditing tools. + </flag> + <flag name='netware'> + Build libraries and tools to work with NetWare protocols (IPX + and NCP). + </flag> + </use> +</pkgmetadata> |