[gentoo-commits] repo/gentoo:master commit in: sys-freebsd/freebsd-ubin/files/, sys-freebsd/freebsd-ubin/

2019-01-22 Thread Michał Górny
commit: e5f0fdfe2fc4c70091efb4806078158ad7d9ca55
Author: Michał Górny  gentoo  org>
AuthorDate: Tue Jan 22 16:34:23 2019 +
Commit: Michał Górny  gentoo  org>
CommitDate: Tue Jan 22 19:04:55 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e5f0fdfe

sys-freebsd/freebsd-ubin: Install 'man' as part of the package

Since sys-apps/man is being treecleaned, and sys-apps/man-db is bloated
with dependencies that are plain broken on FreeBSD, build & install
the original FreeBSD man implementation.

Signed-off-by: Michał Górny  gentoo.org>

 .../files/freebsd-ubin-11.1-man-paths.patch|  40 
 .../freebsd-ubin/freebsd-ubin-11.1-r1.ebuild   | 214 +
 2 files changed, 254 insertions(+)

diff --git a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-11.1-man-paths.patch 
b/sys-freebsd/freebsd-ubin/files/freebsd-ubin-11.1-man-paths.patch
new file mode 100644
index 000..c26a672f372
--- /dev/null
+++ b/sys-freebsd/freebsd-ubin/files/freebsd-ubin-11.1-man-paths.patch
@@ -0,0 +1,40 @@
+diff -dupr a/usr.bin/man/man.sh b/usr.bin/man/man.sh
+--- a/usr.bin/man/man.sh   2017-07-21 01:43:23.0 +0200
 b/usr.bin/man/man.sh   2019-01-22 19:32:52.136578832 +0100
+@@ -883,12 +883,12 @@ search_whatis() {
+ # Finds an appropriate decompressor based on extension
+ setup_cattool() {
+   case "$1" in
+-  *.bz)   cattool='/usr/bin/bzcat' ;;
+-  *.bz2)  cattool='/usr/bin/bzcat' ;;
+-  *.gz)   cattool='/usr/bin/zcat' ;;
+-  *.lzma) cattool='/usr/bin/lzcat' ;;
+-  *.xz)   cattool='/usr/bin/xzcat' ;;
+-  *)  cattool='/usr/bin/zcat -f' ;;
++  *.bz)   cattool='bzcat' ;;
++  *.bz2)  cattool='bzcat' ;;
++  *.gz)   cattool='zcat' ;;
++  *.lzma) cattool='lzcat' ;;
++  *.xz)   cattool='xzcat' ;;
++  *)  cattool='zcat -f' ;;
+   esac
+ }
+ 
+@@ -903,7 +903,7 @@ setup_pager() {
+   if [ -n "$PAGER" ]; then
+   MANPAGER="$PAGER"
+   else
+-  MANPAGER="more -s"
++  MANPAGER="less -sR"
+   fi
+   fi
+   fi
+@@ -1008,7 +1008,7 @@ SYSCTL=/sbin/sysctl
+ debug=0
+ man_default_sections='1:8:2:3:n:4:5:6:7:9:l'
+ man_default_path='/usr/share/man:/usr/share/openssl/man:/usr/local/man'
+-cattool='/usr/bin/zcat -f'
++cattool='zcat -f'
+ 
+ config_global='/etc/man.conf'
+ 

diff --git a/sys-freebsd/freebsd-ubin/freebsd-ubin-11.1-r1.ebuild 
b/sys-freebsd/freebsd-ubin/freebsd-ubin-11.1-r1.ebuild
new file mode 100644
index 000..1ed9907fc97
--- /dev/null
+++ b/sys-freebsd/freebsd-ubin/freebsd-ubin-11.1-r1.ebuild
@@ -0,0 +1,214 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit bsdmk freebsd flag-o-matic pam multilib multibuild multilib-build
+
+DESCRIPTION="FreeBSD's base system source for /usr/bin"
+SLOT="0"
+IUSE="ar atm audit bluetooth ipv6 kerberos netware nis ssl usb build zfs"
+LICENSE="BSD zfs? ( CDDL )"
+
+# Security Advisory and Errata patches.
+# UPSTREAM_PATCHES=()
+
+if [[ ${PV} != ** ]]; then
+   KEYWORDS="~amd64-fbsd ~x86-fbsd"
+   SRC_URI="${SRC_URI}
+   $(freebsd_upstream_patches)"
+fi
+
+EXTRACTONLY="
+   usr.bin/
+   contrib/
+   lib/
+   etc/
+   bin/
+   include/
+"
+
+RDEPEND="=sys-freebsd/freebsd-lib-${RV}*[usb?,bluetooth?,${MULTILIB_USEDEP}]
+   ssl? ( dev-libs/openssl:0= )
+   kerberos? ( virtual/krb5 )
+   ar? ( >=app-arch/libarchive-3 )
+   virtual/pam
+   sys-libs/zlib
+   >=sys-libs/ncurses-5.9:0=
+   !sys-process/fuser-bsd
+   !dev-util/csup
+   !dev-libs/libiconv
+   !sys-apps/man
+   !sys-apps/man-db
+   !sys-freebsd/freebsd-contrib"
+
+DEPEND="${RDEPEND}
+   sys-devel/flex
+   !build? ( =sys-freebsd/freebsd-sources-${RV}* )
+   =sys-freebsd/freebsd-sbin-${RV}*
+   =sys-freebsd/freebsd-mk-defs-${RV}*"
+
+RDEPEND="${RDEPEND}
+   >=sys-auth/pambase-20080219.1
+   sys-process/cronbase"
+
+S="${WORKDIR}/usr.bin"
+
+PATCHES=( "${FILESDIR}/${PN}-6.0-bsdcmp.patch"
+   "${FILESDIR}/${PN}-11.1-fixmakefiles.patch"
+   "${FILESDIR}/${PN}-11.0-setXid.patch"
+   "${FILESDIR}/${PN}-lint-stdarg.patch"
+   "${FILESDIR}/${PN}-9.1-bsdar.patch"
+   "${FILESDIR}/${PN}-10.2-talk-workaround.patch"
+   "${FILESDIR}/${PN}-10.2-bsdxml.patch"
+   "${FILESDIR}/${PN}-11.1-man-paths.patch" )
+
+# Here we remove some sources we don't need because they are already
+# provided by portage's packages or similar. In order:
+# - Archiving tools, provided by their own ebuilds
+# - ncurses stuff
+# - less stuff
+# - bind utils
+# - rsh stuff
+# - binutils gprof
+# - dc stuff
+# and the rest are misc utils we already provide somewhere else.
+REMOVE_SUBDIRS="bzip2 bzip2recover tar cpio
+   gzip gprof minigzip
+   lzmainfo xz 

[gentoo-commits] repo/gentoo:master commit in: sys-freebsd/freebsd-ubin/files/

2017-12-12 Thread Fabian Groffen
commit: 866ec5cd537af57774a267128214923f591cfb09
Author: Michael Mair-Keimberger  gmail  com>
AuthorDate: Tue Nov 28 19:33:06 2017 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Tue Dec 12 18:36:52 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=866ec5cd

sys-freebsd/freebsd-ubin: remove unused files

Signed-off-by: Fabian Groffen  gentoo.org>

 sys-freebsd/freebsd-ubin/files/login.pamd  | 18 --
 sys-freebsd/freebsd-ubin/files/passwd.pamd |  9 -
 sys-freebsd/freebsd-ubin/files/su.pamd | 15 ---
 3 files changed, 42 deletions(-)

diff --git a/sys-freebsd/freebsd-ubin/files/login.pamd 
b/sys-freebsd/freebsd-ubin/files/login.pamd
deleted file mode 100644
index ff1b6a8af1c..000
--- a/sys-freebsd/freebsd-ubin/files/login.pamd
+++ /dev/null
@@ -1,18 +0,0 @@
-#
-# PAM configuration for the "login" service
-#
-
-# auth
-auth   requiredpam_nologin.so  no_warn
-auth   sufficient  pam_self.so no_warn
-auth   include system
-
-# account
-accountrequisite   pam_securetty.so
-accountinclude system
-
-# session
-sessioninclude system
-
-# password
-password   include system

diff --git a/sys-freebsd/freebsd-ubin/files/passwd.pamd 
b/sys-freebsd/freebsd-ubin/files/passwd.pamd
deleted file mode 100644
index a2a928686dc..000
--- a/sys-freebsd/freebsd-ubin/files/passwd.pamd
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-# PAM configuration for the "passwd" service
-#
-
-# passwd(1) does not use the auth, account or session services.
-
-# password
-#password  requisite   pam_passwdqc.so enforce=users
-password   requiredpam_unix.so no_warn try_first_pass 
nullok

diff --git a/sys-freebsd/freebsd-ubin/files/su.pamd 
b/sys-freebsd/freebsd-ubin/files/su.pamd
deleted file mode 100644
index be70c96a96a..000
--- a/sys-freebsd/freebsd-ubin/files/su.pamd
+++ /dev/null
@@ -1,15 +0,0 @@
-#
-# PAM configuration for the "su" service
-#
-
-# auth
-auth   sufficient  pam_rootok.so   no_warn
-auth   sufficient  pam_self.so no_warn
-auth   requisite   pam_group.sono_warn group=wheel 
root_only fail_safe
-auth   include system
-
-# account
-accountinclude system
-
-# session
-sessionrequiredpam_permit.so



[gentoo-commits] repo/gentoo:master commit in: sys-freebsd/freebsd-ubin/files/

2017-02-11 Thread David Seifert
commit: e29c096ffb3f060a93ed28ae025e689b325bcbde
Author: Michael Mair-Keimberger (asterix)  gmail 
 com>
AuthorDate: Fri Feb 10 16:57:49 2017 +
Commit: David Seifert  gentoo  org>
CommitDate: Sat Feb 11 20:14:30 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e29c096f

sys-freebsd/freebsd-ubin: remove unused patch

Closes: https://github.com/gentoo/gentoo/pull/3903

 .../files/freebsd-ubin-10.1-kdump-workaround.patch  | 13 -
 1 file changed, 13 deletions(-)

diff --git 
a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-10.1-kdump-workaround.patch 
b/sys-freebsd/freebsd-ubin/files/freebsd-ubin-10.1-kdump-workaround.patch
deleted file mode 100644
index 064647cfa5..00
--- a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-10.1-kdump-workaround.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/usr.bin/kdump/Makefile b/usr.bin/kdump/Makefile
-index cbf31d0..fa0d04d 100644
 a/usr.bin/kdump/Makefile
-+++ b/usr.bin/kdump/Makefile
-@@ -8,7 +8,7 @@ SFX=   32
- .PATH: ${.CURDIR}/../ktrace
- 
- PROG= kdump
--SRCS= kdump_subr.c kdump.c ioctl.c subr.c
-+SRCS= kdump_subr.h kdump_subr.c kdump.c ioctl.c subr.c
- DPSRCS=   kdump_subr.h 
- CFLAGS+=  -I${.CURDIR}/../ktrace -I${.CURDIR} -I${.CURDIR}/../.. -I.
-