From 4b19be30aa626b327c885dae62c559ec0e9fb935 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 13 Oct 2019 22:19:36 +0100 Subject: gentoo resync : 13.10.2019 --- sys-freebsd/freebsd-usbin/Manifest | 18 -- .../files/freebsd-usbin-10.3-bsdxml2expat.patch | 13 -- .../files/freebsd-usbin-11.0-workaround.patch | 13 -- .../files/freebsd-usbin-11.1-bsdxml2expat.patch | 26 --- .../files/freebsd-usbin-9.0-newsyslog.patch | 12 -- ...in-SA-1803-speculative_execution-amd64-11.patch | 189 -------------------- .../files/freebsd-usbin-adduser.patch | 20 --- sys-freebsd/freebsd-usbin/files/iscsid.initd | 20 --- sys-freebsd/freebsd-usbin/files/nfs.confd | 10 -- sys-freebsd/freebsd-usbin/files/nfs.initd | 54 ------ sys-freebsd/freebsd-usbin/files/nfsuserd.confd | 5 - sys-freebsd/freebsd-usbin/files/nfsuserd.initd | 20 --- sys-freebsd/freebsd-usbin/files/pw.conf | 5 - sys-freebsd/freebsd-usbin/files/rpc.lockd.initd | 20 --- sys-freebsd/freebsd-usbin/files/rpc.statd.initd | 20 --- .../freebsd-usbin/freebsd-usbin-11.1.ebuild | 189 -------------------- .../freebsd-usbin/freebsd-usbin-11.1_p1.ebuild | 191 --------------------- sys-freebsd/freebsd-usbin/metadata.xml | 19 -- 18 files changed, 844 deletions(-) delete mode 100644 sys-freebsd/freebsd-usbin/Manifest delete mode 100644 sys-freebsd/freebsd-usbin/files/freebsd-usbin-10.3-bsdxml2expat.patch delete mode 100644 sys-freebsd/freebsd-usbin/files/freebsd-usbin-11.0-workaround.patch delete mode 100644 sys-freebsd/freebsd-usbin/files/freebsd-usbin-11.1-bsdxml2expat.patch delete mode 100644 sys-freebsd/freebsd-usbin/files/freebsd-usbin-9.0-newsyslog.patch delete mode 100644 sys-freebsd/freebsd-usbin/files/freebsd-usbin-SA-1803-speculative_execution-amd64-11.patch delete mode 100644 sys-freebsd/freebsd-usbin/files/freebsd-usbin-adduser.patch delete mode 100644 sys-freebsd/freebsd-usbin/files/iscsid.initd delete mode 100644 sys-freebsd/freebsd-usbin/files/nfs.confd delete mode 100644 sys-freebsd/freebsd-usbin/files/nfs.initd delete mode 100644 sys-freebsd/freebsd-usbin/files/nfsuserd.confd delete mode 100644 sys-freebsd/freebsd-usbin/files/nfsuserd.initd delete mode 100644 sys-freebsd/freebsd-usbin/files/pw.conf delete mode 100644 sys-freebsd/freebsd-usbin/files/rpc.lockd.initd delete mode 100644 sys-freebsd/freebsd-usbin/files/rpc.statd.initd delete mode 100644 sys-freebsd/freebsd-usbin/freebsd-usbin-11.1.ebuild delete mode 100644 sys-freebsd/freebsd-usbin/freebsd-usbin-11.1_p1.ebuild delete mode 100644 sys-freebsd/freebsd-usbin/metadata.xml (limited to 'sys-freebsd/freebsd-usbin') diff --git a/sys-freebsd/freebsd-usbin/Manifest b/sys-freebsd/freebsd-usbin/Manifest deleted file mode 100644 index 258eb84ae7a6..000000000000 --- a/sys-freebsd/freebsd-usbin/Manifest +++ /dev/null @@ -1,18 +0,0 @@ -AUX freebsd-usbin-10.3-bsdxml2expat.patch 406 BLAKE2B bddbdf3869a084f4a3eed616398bbcad3759570ce25ff4467747f2ac1795a50cc082e5e2858f61faa3d70acecbf91c0f793d6a559622e3c8f8a07485138bfa79 SHA512 91a2323b5007e2381fb58d608dd19dcc010afb398a4b2285b53cae4157268fb6aa232323280cec72cccdb2010610f73e048b06bae76418b7db8cd1f34b7ad8dd -AUX freebsd-usbin-11.0-workaround.patch 374 BLAKE2B 7e4b18ccddd1da87fc2d6bb8d8c98be45cc1b2d1d8b383316746a793b6eb3aa9d722e11ea600d0c49111b00c5ddb237eaa019b2babeed86da7d0beef6ff0189d SHA512 c9e8b493d99581dd7beac48def291843e31649a2962f720ed06ef095a128b039e8308662cfbbfcbecfbd0265132bb7a4df9d895ffe69aac09c129389ba5be518 -AUX freebsd-usbin-11.1-bsdxml2expat.patch 841 BLAKE2B 89b5b0ed64dcf5c95eb727110651bb77079a4ccfc346fbd9ac1b26e3a4d53c452d657379ca876e6eb8b50dd90be59737b84405de873613dadf3bebeae7c788de SHA512 69f9055dc536132f1ec46389b53e25261632d726bc74857210ecb5511114f07d4b550e5e4a7a6e066a4a68c4a4bb4e44309d01f569b154fc773247dbd7f3fb23 -AUX freebsd-usbin-9.0-newsyslog.patch 507 BLAKE2B 7c95ebd60ca6cc1bac56b84359a389dada9e71de9f275cf99d72f329fb408bd16845fb46d60037c514deb4ea21cd894da57ae28193e56970e383c5a8e1c689b7 SHA512 5423fc577035c2a272d4cb4305c5ee5e1e910a68af44595524665f7b867bd0a48bab0349b2fa13eabc385b2ec29c8f578d018cd8196f3ad20a13a68d36a335ae -AUX freebsd-usbin-SA-1803-speculative_execution-amd64-11.patch 3658 BLAKE2B 4c7c4aa7d65ae2f36ea08568ca6fb9412456dda432f459a99b5e68858dc5b2ea6e023cb257e6659a5ca31e572c537c9169c832cc5ca39cad7a38efc2c52283df SHA512 c46b73a1c104470d631f3b874e592e33d2bf100258d774fbaec406c3d3985fb3283bce2f51911a5d73e5f66b5a3bc5d38d4cbeab0439acd21cfbf376e496971a -AUX freebsd-usbin-adduser.patch 428 BLAKE2B 3008953aa7ea14405b0e914f518fa05a5de744283110959900ab1ee9887b8b48d8d15131f26280773ff0173f1c60c077c66fedfad1b0310d0e6c5abb5a2b1370 SHA512 51720e3db9bf3728afc0dc370a469746cb1bf61623c44a20c58e27d647e5a5d0360145b1d174382176d803f2558afa2f2a29eca6c85c638529d0e11e2859c0c3 -AUX iscsid.initd 429 BLAKE2B 366c216bf7f4584d1aa115302547b7066105b5107a976504c68725a1f7ca80adb7bd19b4acdaa2ea41b45c42bfed2b028a17ab28201163222788432768f2e5a6 SHA512 49a90719aa0279e19899a2107113cad0784a2cf3b57a0c24ad08549fa4b44dcb1aceecd71027e363b8d2cbbe1b590480ef7806cb05d8b00c1830c2d77b8a8540 -AUX nfs.confd 303 BLAKE2B 69f72512c7e518f9078ea3873c5a2c9f0e1fef02ba3d769a18d1c8f347a8f8d5981cbe7ce34946431b373ae2b580505d74714f7bdbc0a7298745f02f96d35404 SHA512 4224c7f525e39b105b8d80caa7db0f3e0b07d6c521970b2aacfd707ef524262cbdb9ed8aa5151022d571a759151dd25a280fc765a38e67864b0c446ee9fd6b5a -AUX nfs.initd 1424 BLAKE2B d3988adba20f8c8d4114342ca90752ea6dfce1993bce29991655639b995784bb25f8ebd7d0dee687d5e5e2970862f688dcc74239fac4b7de4beb8cddc6c1cdad SHA512 1d85de665dfea1845189f2ad2e7205ab6185ce228f7140ccaafa22c84f8b9f0b4b4c5a26bd53895f1f2c4639bbeb8d5b76106d2e64851eb62f229028dc61cb5c -AUX nfsuserd.confd 153 BLAKE2B 931bde9b889bae7a58a9dd2b37583e1b9caa610a4eda9f4b70ed15d8a8752edc669b9b7f45d5613db57f05648c9f20f0efe2808f25b000627dd7c36778efce58 SHA512 47bf885dc80a61c9f8aab5890a360063fc2e846ce8abefb84e9d504f62c455cd759af753c7a5ab8cdd624842200f6b0ec7d177ddfdc1e7564460764eb4d4d073 -AUX nfsuserd.initd 447 BLAKE2B 0367d6849fc1392ae308023c5c5ddf4df0db0b38e86c486d8d482ce2a31af5332462bc1a46d0c79006323341a50e994f1f86f5e08773206f8c7a99f1060508ff SHA512 e18cbd9efa3bf9e7283a9633bebfadfa9160b6eb668f48723bb9f1b37c5476b75b71b505046025a185a74d409ce09fd305257cdcb6e953c795ed1397fbe76323 -AUX pw.conf 179 BLAKE2B d93e3d2df7bc636b21b2bfa30b5b76b671f98631c360f7977c9368b0f1fa96cfa922c6820836addd24804b50c3a9978ca901dd7068f5d721b8ac8c6b8ff151f7 SHA512 042b7c7805d891f453da58f607edb3174fddc8443d6995ebe833185ab313328c131bae87dbbc9db95bf69a9ee71548d350191b34a8b2bf41a56416aff03c3891 -AUX rpc.lockd.initd 530 BLAKE2B 03926d9b01e3d191030a18785ef53824836d1826895d064a303d83f5eff8e3a3630273d5547d1d0d95bd85db7f421b790671cf9e882af58621dd8756fde86fe6 SHA512 930c42b63a230f6f64ecdaec95f61e43b463abe109f926c298507fa3c6b090edba1f8dcc95046a0a5b8c0378d336fbf728f9db77b8b0822d0e2b36713fefc9e5 -AUX rpc.statd.initd 520 BLAKE2B 701d58e57520dd9237a7e2261071304a1f820816c0902e06122a4729872432e6c29dc62a686f53d674a75f2c3050b6adf04b2d3c665f2f3639362fecf0ca929c SHA512 62c3bef69ca0619e3492050379a4c8b490305ab0ee7620143c31be7af414b1f1cbd79feaee345bd5e6bfdfa6c93bcce3cc9ff61a2f63e235a3807920e260cb7a -DIST freebsd-src-11.1.tar.xz 147661560 BLAKE2B a9e6ba9d0e12c8b56ac58575d5f02931edbb6a3545d9dccae78810d2d0470a29b29dd7f724b03b8afafbca23717a71346e4cfbd3530e0f40118a23609c3f414e SHA512 b97707ec7a601ca6bcb682c45f6d94a38484301ac24630d7285eff6f88b027ce6900c93fc62f8ce36e0cf32c91f73a9d1c999db397b7f8782fd74a8551a03aca -EBUILD freebsd-usbin-11.1.ebuild 5442 BLAKE2B 68a9b16ec4eceded11cbfda41eaf8e5d5108e43ba16d351c8e7e82480ab747f9088592bf6dc9aeb35507cfe0d53936108dee467ed0ddac1b728141116925f42b SHA512 ec043c20093c49637c5ee352259015addcf23c610c893a21b3a9f512b097b3d659ed788316540435b3edfedbe3b949325f2a935a8d46acd61593cb27dd6756ac -EBUILD freebsd-usbin-11.1_p1.ebuild 5548 BLAKE2B 6217891573dc7dd83498f33f90b8c0c8a64ea6ace55694f395a95c9a076047235d8418874f3fc93fb858370a70ed52c3cbeb65a7e053a72ecea5f6feb02d9d9c SHA512 ffa8839deadf38ee3607f372d4aecc418254417c026b712deeb68cb2c7527c2d91f845580d3d3e31f985c6bd975a3524aa54786a76c115beaee765a2fc6f9d3e -MISC metadata.xml 599 BLAKE2B 70b00a85a1d670dc842bf5234aa6a82cc31564ec25c2f1789440b5beae5e4e0ab76b7b16122b92205d616e86225d892eb183f21c3e0c8aa63cb32f60a0647265 SHA512 afe1f9e8ccacac89bcd308b6476bba009035542f86d71f70f27df029ff20dda7ff7ff8c9510e6939d502a31750c6bf69de608440fb61b1d590d018446aa14f99 diff --git a/sys-freebsd/freebsd-usbin/files/freebsd-usbin-10.3-bsdxml2expat.patch b/sys-freebsd/freebsd-usbin/files/freebsd-usbin-10.3-bsdxml2expat.patch deleted file mode 100644 index 207b6ab6a50d..000000000000 --- a/sys-freebsd/freebsd-usbin/files/freebsd-usbin-10.3-bsdxml2expat.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/usr.sbin/camdd/camdd.c b/usr.sbin/camdd/camdd.c -index 88c648e..edf9c8b 100644 ---- a/usr.sbin/camdd/camdd.c -+++ b/usr.sbin/camdd/camdd.c -@@ -71,7 +71,7 @@ __FBSDID("$FreeBSD: stable/10/usr.sbin/camdd/camdd.c 293409 2016-01-08 02:56:21Z - #include - #include - #include --#include -+#include - - #include - #include diff --git a/sys-freebsd/freebsd-usbin/files/freebsd-usbin-11.0-workaround.patch b/sys-freebsd/freebsd-usbin/files/freebsd-usbin-11.0-workaround.patch deleted file mode 100644 index 04ba75a17ec5..000000000000 --- a/sys-freebsd/freebsd-usbin/files/freebsd-usbin-11.0-workaround.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/usr.sbin/nmtree/Makefile b/usr.sbin/nmtree/Makefile -index 033002c..d198f10 100644 ---- a/usr.sbin/nmtree/Makefile -+++ b/usr.sbin/nmtree/Makefile -@@ -5,7 +5,7 @@ - .PATH: ${.CURDIR}/../../contrib/mtree - - PROG= mtree --MAN= mtree.5 mtree.8 -+MAN= mtree.8 - SRCS= compare.c crc.c create.c excludes.c getid.c misc.c mtree.c \ - only.c spec.c specspec.c verify.c - diff --git a/sys-freebsd/freebsd-usbin/files/freebsd-usbin-11.1-bsdxml2expat.patch b/sys-freebsd/freebsd-usbin/files/freebsd-usbin-11.1-bsdxml2expat.patch deleted file mode 100644 index 5317b256cb4c..000000000000 --- a/sys-freebsd/freebsd-usbin/files/freebsd-usbin-11.1-bsdxml2expat.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/usr.sbin/ctladm/ctladm.c b/usr.sbin/ctladm/ctladm.c -index 9a9d3ff..bf6b1b2 100644 ---- a/usr.sbin/ctladm/ctladm.c -+++ b/usr.sbin/ctladm/ctladm.c -@@ -51,7 +51,7 @@ __FBSDID("$FreeBSD: stable/11/usr.sbin/ctladm/ctladm.c 319152 2017-05-29 18:17:3 - #include - #include - #include --#include -+#include - #include - #include - #include -diff --git a/usr.sbin/ctld/kernel.c b/usr.sbin/ctld/kernel.c -index 7054a04..ee05214 100644 ---- a/usr.sbin/ctld/kernel.c -+++ b/usr.sbin/ctld/kernel.c -@@ -47,7 +47,7 @@ __FBSDID("$FreeBSD: stable/11/usr.sbin/ctld/kernel.c 319152 2017-05-29 18:17:34Z - #include - #include - #include --#include -+#include - #include - #include - #include 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 deleted file mode 100644 index 1d838655c88e..000000000000 --- a/sys-freebsd/freebsd-usbin/files/freebsd-usbin-9.0-newsyslog.patch +++ /dev/null @@ -1,12 +0,0 @@ -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-SA-1803-speculative_execution-amd64-11.patch b/sys-freebsd/freebsd-usbin/files/freebsd-usbin-SA-1803-speculative_execution-amd64-11.patch deleted file mode 100644 index 0cc67ad8f342..000000000000 --- a/sys-freebsd/freebsd-usbin/files/freebsd-usbin-SA-1803-speculative_execution-amd64-11.patch +++ /dev/null @@ -1,189 +0,0 @@ ---- usr.sbin/cpucontrol/cpucontrol.8.orig -+++ usr.sbin/cpucontrol/cpucontrol.8 -@@ -24,7 +24,7 @@ - .\" - .\" $FreeBSD$ - .\" --.Dd June 30, 2009 -+.Dd January 5, 2018 - .Dt CPUCONTROL 8 - .Os - .Sh NAME -@@ -36,44 +36,48 @@ - .Nm - .Op Fl vh - .Fl m Ar msr --.Bk - .Ar device - .Ek -+.Bk - .Nm - .Op Fl vh - .Fl m Ar msr Ns = Ns Ar value --.Bk - .Ar device - .Ek -+.Bk - .Nm - .Op Fl vh - .Fl m Ar msr Ns &= Ns Ar mask --.Bk - .Ar device - .Ek -+.Bk - .Nm - .Op Fl vh - .Fl m Ar msr Ns |= Ns Ar mask --.Bk - .Ar device - .Ek -+.Bk - .Nm - .Op Fl vh - .Fl i Ar level --.Bk - .Ar device - .Ek -+.Bk - .Nm - .Op Fl vh - .Fl i Ar level,level_type --.Bk - .Ar device - .Ek -+.Bk - .Nm - .Op Fl vh - .Op Fl d Ar datadir - .Fl u -+.Ar device -+.Ek - .Bk -+.Nm -+.Fl e - .Ar device - .Ek - .Sh DESCRIPTION -@@ -129,6 +133,20 @@ - .Nm - utility will walk through the configured data directories - and apply all firmware updates available for this CPU. -+.It Fl e -+Re-evaluate the kernel flags indicating the present CPU features. -+This command is typically executed after a firmware update was applied -+which changes information reported by the -+.Dv CPUID -+instruction. -+.Pp -+.Bf -symbolic -+Only execute the -+.Fl e -+command after the microcode update was applied to all CPUs in the system. -+The kernel does not operate correctly if the features of processors are -+not identical. -+.Ef - .It Fl v - Increase the verbosity level. - .It Fl h ---- usr.sbin/cpucontrol/cpucontrol.c.orig -+++ usr.sbin/cpucontrol/cpucontrol.c -@@ -60,6 +60,7 @@ - #define FLAG_I 0x01 - #define FLAG_M 0x02 - #define FLAG_U 0x04 -+#define FLAG_E 0x10 - - #define OP_INVAL 0x00 - #define OP_READ 0x01 -@@ -114,7 +115,7 @@ - if (name == NULL) - name = "cpuctl"; - fprintf(stderr, "Usage: %s [-vh] [-d datadir] [-m msr[=value] | " -- "-i level | -i level,level_type | -u] device\n", name); -+ "-i level | -i level,level_type | -e | -u] device\n", name); - exit(EX_USAGE); - } - -@@ -338,6 +339,25 @@ - } - - static int -+do_eval_cpu_features(const char *dev) -+{ -+ int fd, error; -+ -+ assert(dev != NULL); -+ -+ fd = open(dev, O_RDWR); -+ if (fd < 0) { -+ WARN(0, "error opening %s for writing", dev); -+ return (1); -+ } -+ error = ioctl(fd, CPUCTL_EVAL_CPU_FEATURES, NULL); -+ if (error < 0) -+ WARN(0, "ioctl(%s, CPUCTL_EVAL_CPU_FEATURES)", dev); -+ close(fd); -+ return (error); -+} -+ -+static int - do_update(const char *dev) - { - int fd; -@@ -431,11 +451,14 @@ - * Add all default data dirs to the list first. - */ - datadir_add(DEFAULT_DATADIR); -- while ((c = getopt(argc, argv, "d:hi:m:uv")) != -1) { -+ while ((c = getopt(argc, argv, "d:ehi:m:uv")) != -1) { - switch (c) { - case 'd': - datadir_add(optarg); - break; -+ case 'e': -+ flags |= FLAG_E; -+ break; - case 'i': - flags |= FLAG_I; - cmdarg = optarg; -@@ -464,22 +487,25 @@ - /* NOTREACHED */ - } - dev = argv[0]; -- c = flags & (FLAG_I | FLAG_M | FLAG_U); -+ c = flags & (FLAG_E | FLAG_I | FLAG_M | FLAG_U); - switch (c) { -- case FLAG_I: -- if (strstr(cmdarg, ",") != NULL) -- error = do_cpuid_count(cmdarg, dev); -- else -- error = do_cpuid(cmdarg, dev); -- break; -- case FLAG_M: -- error = do_msr(cmdarg, dev); -- break; -- case FLAG_U: -- error = do_update(dev); -- break; -- default: -- usage(); /* Only one command can be selected. */ -+ case FLAG_I: -+ if (strstr(cmdarg, ",") != NULL) -+ error = do_cpuid_count(cmdarg, dev); -+ else -+ error = do_cpuid(cmdarg, dev); -+ break; -+ case FLAG_M: -+ error = do_msr(cmdarg, dev); -+ break; -+ case FLAG_U: -+ error = do_update(dev); -+ break; -+ case FLAG_E: -+ error = do_eval_cpu_features(dev); -+ break; -+ default: -+ usage(); /* Only one command can be selected. */ - } - SLIST_FREE(&datadirs, next, free); - return (error == 0 ? 0 : 1); diff --git a/sys-freebsd/freebsd-usbin/files/freebsd-usbin-adduser.patch b/sys-freebsd/freebsd-usbin/files/freebsd-usbin-adduser.patch deleted file mode 100644 index 39177b4a987d..000000000000 --- a/sys-freebsd/freebsd-usbin/files/freebsd-usbin-adduser.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- 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 deleted file mode 100644 index f16d00e876ab..000000000000 --- a/sys-freebsd/freebsd-usbin/files/iscsid.initd +++ /dev/null @@ -1,20 +0,0 @@ -#!/sbin/openrc-run -# 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/nfs.confd b/sys-freebsd/freebsd-usbin/files/nfs.confd deleted file mode 100644 index 844252fdc54d..000000000000 --- a/sys-freebsd/freebsd-usbin/files/nfs.confd +++ /dev/null @@ -1,10 +0,0 @@ -# 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 deleted file mode 100644 index 17974ca0998a..000000000000 --- a/sys-freebsd/freebsd-usbin/files/nfs.initd +++ /dev/null @@ -1,54 +0,0 @@ -#!/sbin/openrc-run -# 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/nfsuserd.confd b/sys-freebsd/freebsd-usbin/files/nfsuserd.confd deleted file mode 100644 index f8f3ea1e31de..000000000000 --- a/sys-freebsd/freebsd-usbin/files/nfsuserd.confd +++ /dev/null @@ -1,5 +0,0 @@ -# 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 deleted file mode 100644 index d69007412fc6..000000000000 --- a/sys-freebsd/freebsd-usbin/files/nfsuserd.initd +++ /dev/null @@ -1,20 +0,0 @@ -#!/sbin/openrc-run -# 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/pw.conf b/sys-freebsd/freebsd-usbin/files/pw.conf deleted file mode 100644 index 29a246f72b8f..000000000000 --- a/sys-freebsd/freebsd-usbin/files/pw.conf +++ /dev/null @@ -1,5 +0,0 @@ -# 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/rpc.lockd.initd b/sys-freebsd/freebsd-usbin/files/rpc.lockd.initd deleted file mode 100644 index dd2fdbe8a756..000000000000 --- a/sys-freebsd/freebsd-usbin/files/rpc.lockd.initd +++ /dev/null @@ -1,20 +0,0 @@ -#!/sbin/openrc-run -# 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 deleted file mode 100644 index 163af5a4b4a1..000000000000 --- a/sys-freebsd/freebsd-usbin/files/rpc.statd.initd +++ /dev/null @@ -1,20 +0,0 @@ -#!/sbin/openrc-run -# 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/freebsd-usbin-11.1.ebuild b/sys-freebsd/freebsd-usbin/freebsd-usbin-11.1.ebuild deleted file mode 100644 index 5e4b26e2c2fd..000000000000 --- a/sys-freebsd/freebsd-usbin/freebsd-usbin-11.1.ebuild +++ /dev/null @@ -1,189 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit bsdmk freebsd flag-o-matic eutils - -DESCRIPTION="FreeBSD /usr/sbin tools" -SLOT="0" -LICENSE="BSD zfs? ( CDDL )" - -# Security Advisory and Errata patches. -# UPSTREAM_PATCHES=() - -if [[ ${PV} != *9999* ]]; then - KEYWORDS="~amd64-fbsd ~x86-fbsd" - SRC_URI="${SRC_URI} - $(freebsd_upstream_patches)" -fi - -EXTRACTONLY=" - usr.sbin/ - contrib/ - usr.bin/ - lib/ - sbin/ - etc/ - gnu/ -" - -RDEPEND="=sys-freebsd/freebsd-lib-${RV}*[usb?,bluetooth?,netware?] - build? ( sys-apps/baselayout ) - ssl? ( dev-libs/openssl:0 ) - >=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}* - zfs? ( =sys-freebsd/freebsd-cddl-${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 zfs" - -pkg_setup() { - # Add the required source files. - use nis && EXTRACTONLY+="libexec/ " - use build && EXTRACTONLY+="sys/ include/ " - use zfs && EXTRACTONLY+="cddl/ " - - # 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= " - use zfs || mymakeopts="${mymakeopts} WITHOUT_CDDL= " - - 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}-11.1-bsdxml2expat.patch" - "${FILESDIR}/${PN}-10.3-bsdxml2expat.patch" - "${FILESDIR}/${PN}-11.0-workaround.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 freebsd-update service sysrc bsdinstall" - -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 -} - -src_compile() { - # Preparing to build nmtree, ypldap - for dir in libnetbsd libopenbsd; do - cd "${WORKDIR}/lib/${dir}" || die - freebsd_src_compile -j1 - done - - cd "${S}" || die - 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. - freebsd_src_install DOCDIR=/usr/share/doc/${PF} - - # Most of these now come from openrc. - for util in iscsid nfs nfsuserd rpc.statd rpc.lockd; do - newinitd "${FILESDIR}/"${util}.initd ${util} - if [[ -e "${FILESDIR}"/${util}.confd ]]; then \ - newconfd "${FILESDIR}"/${util}.confd ${util} - fi - done - - for class in daily monthly weekly; do - cat - > "${T}/periodic.${class}" < "${T}/periodic.${class}" < - - - - bsd@gentoo.org - BSD Project - - - Enable floppy disk utilities (fdcontrol, fdformat, fdread, fdwrite). - - Build auditing tools. - - - Build libraries and tools to work with NetWare protocols (IPX - and NCP). - - Enable ZFS support. - - -- cgit v1.2.3