gentoo resync : 16.09.2020

3 files changed, 77 insertions, 4 deletions

diff --git a/app-mobilephone/sobexsrv/Manifest b/app-mobilephone/sobexsrv/Manifest
index 801a8cb8ff84..834626dd2617 100644
--- a/app-mobilephone/sobexsrv/Manifest
+++ b/app-mobilephone/sobexsrv/Manifest
@@ -1,7 +1,8 @@
 AUX conf.d_sobexsrv 1095 BLAKE2B 858ca7030f7809c7eabc1ccd5b856b010a79bc693ef279232ecafa07ccfd99006a72190785308c27c6cd6d9f0422c1fb252e4e85ccb1be11c7445aad59cd2c9e SHA512 c38b6105826208c72392b7e781831ec28e93c60ba63f95e6042c3de9a3097af1e370ccdb832f1993b6e85a0224180b36a92ba97cf9af8a606044a61d9ddf7a05
-AUX init.d_sobexsrv 1473 BLAKE2B f5ed1fccc6de4419a62185fee1460b2acbd101602c09b516c7944a84507f84912b4a493dd9483611ecafbb6ee5083300ba6bf5354e7645240759845c102d6a1f SHA512 0ab5c6020af3c8de1e7f302f1f9b1fb6c8d9f6ef8518f878c48ee396032aa96f2da148e197655a1235a072abf30767e3db8047d0c9c6d7d3606bf9ad30398ec4
+AUX init.d_sobexsrv 1471 BLAKE2B eaf115c6303ede41dbeeaa60561082ac07b9d908f391eb4ca72fb65773a842aa8abd0ca63bb411d6a7db97db7e2dad995b956816845242b9e408701a7daf517b SHA512 6e1beb275bddac1b5e37c82a825e0b1fbb830127401963129bd59b03999136b10ac538e3231b49c50c19dde8e407ef93e0040c62ac0ecaf714b771578f00bd41
 AUX sobexsrv-1.0.1-openobex16.patch 1346 BLAKE2B ec63105eb6db6fd959044134fd66b8b3018093a5efec4b6b6b63c45d9bcca84c678addc56bfefaad0fca1696c148107513a1640473cb37f5320c2fab9a623ded SHA512 a1db1a916c0c2f6f237a4434bf1f11b0b6f540ad62fa9687d886e4ff97f6bb916be7763a24bdc56bf8fd3334ead426e0ed2003c0208c3c743f49b13b2bf8ab2a
 DIST sobexsrv-1.0.1-fix64.patch 25040 BLAKE2B 9796779fdde39c79371a978d4bdb9d6761f9467ecc353096c3d1b13fe1d5aa4f7ceef137d07c52467a175b7bc756e6c747a2800a2dbb2dcd281be463499106c9 SHA512 9d555bee8d03c13061bbe132df6442daa4d8817ef713e92e5150b1994af110c5b01b34f8bcc1c3ae734529e36bb70f56976ab261f860e95e3de3ffe440a7b393
 DIST sobexsrv-1.0.1.tar.gz 27683 BLAKE2B f1aa103aa8a70ea7408ced7b0a3944d0ba61dc9750425160ee95bb69e1f1cf4479fbecef7be3ba4b6cbec2a7f518bed18318ca694545a4606888e7663adb0d38 SHA512 52fe5eff812596caa1f4b8579740ce8b2591db17950d68c093cfdb33ca5b899bfc5c142594843948a29ae0b1bdbe4499a1e24c270c92e61d02fd07a02d9d40cd
 EBUILD sobexsrv-1.0.1-r2.ebuild 2005 BLAKE2B 28fedfe5d4f64bc696d1f481a9855c57bbeb0ae8e6ca0fa9cd493b718051089abb3f17ee96c526f07600d33050bd57c6940d1b7d9178310d2c6735a6dde51071 SHA512 1a60a31ea11f4b21039fcd5e4694fa0d5c5b91c11fccb09d362a8d7862885f2c628f6f52b736db4347fd29a3e6a63b2375868d5771363c2dde272eac2e692637
+EBUILD sobexsrv-1.0.1-r3.ebuild 1515 BLAKE2B eb243e86f5debb674db06630bc856b96ae84f077cbee6512cb3a52198e4005b0af78ca9dbff2d27f04c207d03407d7089174b8e36973666367cc0af5cde2dd3b SHA512 f73a9a9058aa6fe0a4615a34d5472bafd75eba3cb770f3d3fb030be400451c9976a2a38bcc4e3aa7298e6bf6776189637cb22c076e445385288af24cc33423be
 MISC metadata.xml 920 BLAKE2B ac1ea1fc1f85d7dd43c548d89ef3473bb5b78f2e3ab4275c28db702865e492261db1ab908496661ebda406771d7d8080e9057bed865b703b9920ee86b48c8b34 SHA512 30b149f3e197dc0a45cd27a618a0dcc6c9968dae44576c47dd6ebdedda06d5fed8b03ae1e0f94133804551366a90a97614d5d5eca334dbdabd4398278645aab9
diff --git a/app-mobilephone/sobexsrv/files/init.d_sobexsrv b/app-mobilephone/sobexsrv/files/init.d_sobexsrv
index e02530314ca8..fa27e19ef116 100644
--- a/app-mobilephone/sobexsrv/files/init.d_sobexsrv
+++ b/app-mobilephone/sobexsrv/files/init.d_sobexsrv
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 depend() {
@@ -17,7 +17,7 @@ check_config() {
 		return 1
 	fi
 
-	if [ ${CHROOT} = "yes" ] ; then
+	if [ "${CHROOT}" = "yes" ] ; then
 		if [ ! -u /usr/bin/sobexsrv ] ; then
 			eerror "The \$CHROOT option requires /usr/bin/sobexsrv to be suid root!"
 			return 1
@@ -47,7 +47,7 @@ start() {
 
 	OPTIONS="-I -r ${INBOX} ${OPTIONS} ${SOBEXSRV_OPT}"
 
-	start-stop-daemon --chuid ${USER}:${GROUP} --start --quiet --exec /usr/bin/sobexsrv -- $OPTIONS
+	start-stop-daemon --user ${USER}:${GROUP} --start --quiet --exec /usr/bin/sobexsrv -- $OPTIONS
 	eend $?
 }
 
diff --git a/app-mobilephone/sobexsrv/sobexsrv-1.0.1-r3.ebuild b/app-mobilephone/sobexsrv/sobexsrv-1.0.1-r3.ebuild
new file mode 100644
index 000000000000..e748963f7b5d
--- /dev/null
+++ b/app-mobilephone/sobexsrv/sobexsrv-1.0.1-r3.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+MY_P="${P/_pre/pre}"
+
+DESCRIPTION="Scripting/Secure OBEX Server (for BlueZ Linux)"
+SRC_URI="http://www.mulliner.org/bluetooth/${MY_P}.tar.gz
+		 https://dev.gentoo.org/~joker/${P}-fix64.patch"
+HOMEPAGE="http://www.mulliner.org/bluetooth/sobexsrv.php"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+DEPEND="
+	>=dev-libs/openobex-1.7.2-r1
+	net-wireless/bluez
+"
+RDEPEND="${DEPEND}
+	acct-user/sobexsrv
+	acct-group/sobexsrv
+"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${DISTDIR}/${P}"-fix64.patch
+	"${FILESDIR}/${P}"-openobex16.patch
+)
+
+src_prepare() {
+	default
+
+	sed -e 's:/usr/man/man8:/usr/share/man/man8:' \
+		-e 's/install: all/install:/' \
+	    -i Makefile || die
+
+	sed -e 's/^CFLAGS =/CFLAGS +=/' \
+	    -e 's/^CC =/CC ?=/' \
+	    -e 's/$(CC) $(CFLAGS)/$(CC) $(LDFLAGS) $(CFLAGS)/' \
+	    -i src/Makefile || die
+}
+
+src_compile() {
+	tc-export CC
+	emake -C src
+}
+
+src_install() {
+	default
+	dodoc AUTHOR CONFIG SECURITY THANKS
+	rm "${D}/usr/bin/sobexsrv_handler" || die
+
+	newinitd "${FILESDIR}/init.d_sobexsrv" sobexsrv
+	newconfd "${FILESDIR}/conf.d_sobexsrv" sobexsrv
+}
+
+pkg_postinst() {
+	elog
+	elog "/usr/bin/sobexsrv is *NOT* installed set-uid root by"
+	elog "default. suid is required for the chroot option (-R)."
+	elog
+	elog "Execute the following commands to enable suid:"
+	elog
+	elog "chown root:sobexsrv /usr/bin/sobexsrv"
+	elog "chmod 4710 /usr/bin/sobexsrv"
+	elog
+}