* [gentoo-commits] repo/gentoo:master commit in: app-mobilephone/kannel/, app-mobilephone/kannel/files/
@ 2016-04-26 22:27 Austin English
0 siblings, 0 replies; 3+ messages in thread
From: Austin English @ 2016-04-26 22:27 UTC (permalink / raw
To: gentoo-commits
commit: 9084aa7d239f12d44cbd547e8d9622af5f920a01
Author: Austin English <wizardedit <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 26 20:25:21 2016 +0000
Commit: Austin English <wizardedit <AT> gentoo <DOT> org>
CommitDate: Tue Apr 26 22:26:32 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9084aa7d
app-mobilephone/kannel: use #!/sbin/openrc-run instead of #!/sbin/runscript
Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=573846
Package-Manager: portage-2.2.26
.../kannel/files/kannel-bearerbox.initd | 4 +-
app-mobilephone/kannel/files/kannel-initd | 2 +-
app-mobilephone/kannel/files/kannel-smsbox.initd | 4 +-
app-mobilephone/kannel/files/kannel-wapbox.initd | 4 +-
app-mobilephone/kannel/kannel-1.4.3-r2.ebuild | 120 ++++++++++++++++++++
app-mobilephone/kannel/kannel-1.5.0-r1.ebuild | 122 +++++++++++++++++++++
6 files changed, 249 insertions(+), 7 deletions(-)
diff --git a/app-mobilephone/kannel/files/kannel-bearerbox.initd b/app-mobilephone/kannel/files/kannel-bearerbox.initd
index 7034cb6..14259d5 100644
--- a/app-mobilephone/kannel/files/kannel-bearerbox.initd
+++ b/app-mobilephone/kannel/files/kannel-bearerbox.initd
@@ -1,5 +1,5 @@
-#!/sbin/runscript
-# Copyright 1999-2009 Gentoo Foundation
+#!/sbin/openrc-run
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
diff --git a/app-mobilephone/kannel/files/kannel-initd b/app-mobilephone/kannel/files/kannel-initd
index 25003fd..ddb5c7a 100644
--- a/app-mobilephone/kannel/files/kannel-initd
+++ b/app-mobilephone/kannel/files/kannel-initd
@@ -1,4 +1,4 @@
-#!/sbin/runscript
+#!/sbin/openrc-run
depend() {
need net
diff --git a/app-mobilephone/kannel/files/kannel-smsbox.initd b/app-mobilephone/kannel/files/kannel-smsbox.initd
index 5baf182..73087e6 100644
--- a/app-mobilephone/kannel/files/kannel-smsbox.initd
+++ b/app-mobilephone/kannel/files/kannel-smsbox.initd
@@ -1,5 +1,5 @@
-#!/sbin/runscript
-# Copyright 1999-2009 Gentoo Foundation
+#!/sbin/openrc-run
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
diff --git a/app-mobilephone/kannel/files/kannel-wapbox.initd b/app-mobilephone/kannel/files/kannel-wapbox.initd
index 5baf182..73087e6 100644
--- a/app-mobilephone/kannel/files/kannel-wapbox.initd
+++ b/app-mobilephone/kannel/files/kannel-wapbox.initd
@@ -1,5 +1,5 @@
-#!/sbin/runscript
-# Copyright 1999-2009 Gentoo Foundation
+#!/sbin/openrc-run
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
diff --git a/app-mobilephone/kannel/kannel-1.4.3-r2.ebuild b/app-mobilephone/kannel/kannel-1.4.3-r2.ebuild
new file mode 100644
index 0000000..df695fd
--- /dev/null
+++ b/app-mobilephone/kannel/kannel-1.4.3-r2.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="2"
+WANT_AUTOMAKE=none
+
+inherit eutils autotools flag-o-matic ssl-cert user
+
+DESCRIPTION="Powerful SMS and WAP gateway"
+HOMEPAGE="http://www.kannel.org/"
+SRC_URI="http://www.kannel.org/download/${PV}/gateway-${PV}.tar.gz"
+
+LICENSE="Apache-1.1"
+SLOT="0"
+KEYWORDS="~amd64 x86"
+IUSE="ssl mysql sqlite postgres pcre doc debug pam"
+
+RESTRICT="test" # some tests fail with "address already in use"
+
+RDEPEND="sys-libs/e2fsprogs-libs
+ dev-libs/libxml2
+ dev-lang/perl
+ sys-libs/zlib
+ ssl? ( dev-libs/openssl )
+ mysql? ( virtual/mysql )
+ sqlite? ( dev-db/sqlite:3 )
+ postgres? ( dev-db/postgresql[server] )
+ pcre? ( dev-libs/libpcre )
+ pam? ( virtual/pam )"
+DEPEND="${RDEPEND}
+ >=sys-devel/bison-2.2
+ doc? ( media-gfx/transfig
+ app-text/jadetex
+ app-text/docbook-dsssl-stylesheets
+ app-text/docbook-sgml-dtd:3.1 )"
+
+S="${WORKDIR}/gateway-${PV}"
+
+pkg_setup() {
+ enewgroup kannel
+ enewuser kannel -1 -1 /var/log/kannel kannel
+}
+
+src_prepare() {
+ epatch "${FILESDIR}/${P}-custom-wap-ports.patch"
+ epatch "${FILESDIR}/${P}-autotools.patch"
+ epatch "${FILESDIR}/${P}-external-libuuid.patch"
+
+ #by default, use current directory for logging
+ sed -i -e 's:/tmp/::' doc/examples/kannel.conf
+
+ eautoconf
+}
+
+src_configure() {
+ append-flags -fno-strict-aliasing # some code breaks strict aliasing
+ econf --docdir=/usr/share/doc/${PF} \
+ --enable-localtime \
+ --disable-start-stop-daemon \
+ --without-sqlite2 \
+ $(use_enable pam) \
+ $(use_enable debug debug) \
+ $(use_enable pcre) \
+ $(use_enable doc docs) \
+ $(use_enable ssl) \
+ $(use_with mysql) \
+ $(use_with sqlite sqlite3) \
+ $(use_with postgres pgsql) \
+ || die "econf failed"
+}
+
+# phase disabled by RESTRICT
+# src_test() {
+# emake check || die "emake check failed"
+# }
+
+src_install() {
+ emake DESTDIR="${D}" install || die "emake install failed"
+
+ if use doc; then
+ emake DESTDIR="${D}" install-docs || die "emake install-docs failed"
+ fi
+ dodoc README
+
+ diropts -g kannel -m0750
+ dodir /etc/kannel
+ insinto /etc/kannel
+ newins doc/examples/kannel.conf kannel.conf.sample
+
+ local f
+ for f in bearerbox smsbox wapbox; do
+ newinitd "${FILESDIR}/kannel-$f.initd" kannel-$f
+ done
+
+ diropts -g kannel -m0770
+ keepdir /var/log/kannel /var/run/kannel
+}
+
+pkg_postinst() {
+ if use ssl; then
+ elog "SSL certificate can be created by running"
+ elog " emerge --config =${CATEGORY}/${PF}"
+ fi
+}
+
+pkg_config() {
+ if use ssl; then
+ if install_cert /etc/ssl/kannel; then
+ chown kannel "${ROOT}"etc/ssl/kannel.{pem,key}
+ einfo "For using this certificate, you have to add following line to your kannel.conf:"
+ einfo ' ssl-client-certkey-file = "/etc/ssl/kannel.pem"'
+ einfo ' ssl-server-cert-file = "/etc/ssl/kannel.crt"'
+ einfo ' ssl-server-key-file = "/etc/ssl/kannel.key"'
+ fi
+ else
+ eerror "This phase exists only for creating kannel SSL certificate"
+ eerror "and ssl USE flag is disabled for this package!"
+ fi
+}
diff --git a/app-mobilephone/kannel/kannel-1.5.0-r1.ebuild b/app-mobilephone/kannel/kannel-1.5.0-r1.ebuild
new file mode 100644
index 0000000..ee84be2
--- /dev/null
+++ b/app-mobilephone/kannel/kannel-1.5.0-r1.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+WANT_AUTOMAKE=none
+
+inherit eutils autotools flag-o-matic ssl-cert user
+
+DESCRIPTION="Powerful SMS and WAP gateway"
+HOMEPAGE="http://www.kannel.org/"
+SRC_URI="http://www.kannel.org/download/${PV}/gateway-${PV}.tar.gz"
+
+LICENSE="Apache-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug doc mysql pam pcre postgres sqlite ssl"
+
+RESTRICT="test" # some tests fail with "address already in use"
+
+RDEPEND="sys-libs/e2fsprogs-libs
+ dev-libs/libxml2
+ dev-lang/perl
+ sys-libs/zlib
+ ssl? ( dev-libs/openssl )
+ mysql? ( virtual/mysql )
+ sqlite? ( dev-db/sqlite:3 )
+ postgres? ( dev-db/postgresql[server] )
+ pcre? ( dev-libs/libpcre )
+ pam? ( virtual/pam )
+"
+DEPEND="${RDEPEND}
+ >=sys-devel/bison-2.2
+ doc? ( media-gfx/transfig
+ app-text/jadetex
+ app-text/docbook-dsssl-stylesheets
+ app-text/docbook-sgml-dtd:3.1 )
+"
+
+S="${WORKDIR}/gateway-${PV}"
+
+pkg_setup() {
+ enewgroup kannel
+ enewuser kannel -1 -1 /var/log/kannel kannel
+}
+
+src_prepare() {
+ epatch "${FILESDIR}/${PN}-1.5.0-custom-wap-ports.patch"
+ epatch "${FILESDIR}/${PN}-1.4.3-autotools.patch"
+ epatch "${FILESDIR}/${PN}-1.4.3-external-libuuid.patch"
+
+ #by default, use current directory for logging
+ sed -i -e 's:/tmp/::' doc/examples/kannel.conf
+
+ eautoconf
+}
+
+src_configure() {
+ append-flags -fno-strict-aliasing # some code breaks strict aliasing
+ econf --docdir=/usr/share/doc/${PF} \
+ --enable-localtime \
+ --disable-start-stop-daemon \
+ --without-sqlite2 \
+ $(use_enable pam) \
+ $(use_enable debug debug) \
+ $(use_enable pcre) \
+ $(use_enable doc docs) \
+ $(use_enable ssl) \
+ $(use_with mysql) \
+ $(use_with sqlite sqlite3) \
+ $(use_with postgres pgsql) \
+ || die "econf failed"
+}
+
+# phase disabled by RESTRICT
+# src_test() {
+# emake check || die "emake check failed"
+# }
+
+src_install() {
+ emake DESTDIR="${D}" install || die "emake install failed"
+
+ if use doc; then
+ emake -j1 DESTDIR="${D}" install-docs || die "emake install-docs failed"
+ fi
+ dodoc README
+
+ diropts -g kannel -m0750
+ dodir /etc/kannel
+ insinto /etc/kannel
+ newins doc/examples/kannel.conf kannel.conf.sample
+
+ local f
+ for f in bearerbox smsbox wapbox; do
+ newinitd "${FILESDIR}/kannel-$f.initd" kannel-$f
+ done
+
+ diropts -g kannel -m0770
+ keepdir /var/log/kannel /var/run/kannel
+}
+
+pkg_postinst() {
+ if use ssl; then
+ elog "SSL certificate can be created by running"
+ elog " emerge --config =${CATEGORY}/${PF}"
+ fi
+}
+
+pkg_config() {
+ if use ssl; then
+ if install_cert /etc/ssl/kannel; then
+ chown kannel "${ROOT}"etc/ssl/kannel.{pem,key}
+ einfo "For using this certificate, you have to add following line to your kannel.conf:"
+ einfo ' ssl-client-certkey-file = "/etc/ssl/kannel.pem"'
+ einfo ' ssl-server-cert-file = "/etc/ssl/kannel.crt"'
+ einfo ' ssl-server-key-file = "/etc/ssl/kannel.key"'
+ fi
+ else
+ eerror "This phase exists only for creating kannel SSL certificate"
+ eerror "and ssl USE flag is disabled for this package!"
+ fi
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-mobilephone/kannel/, app-mobilephone/kannel/files/
@ 2016-07-20 14:56 Mike Gilbert
0 siblings, 0 replies; 3+ messages in thread
From: Mike Gilbert @ 2016-07-20 14:56 UTC (permalink / raw
To: gentoo-commits
commit: 3e4fb0e5e45eb8b2fb41fd5ab802c43454bbf00e
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 20 14:49:14 2016 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Wed Jul 20 14:52:59 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e4fb0e5
app-mobilephone/kannel: Don't keepdir /var/run/kannel
Call checkpath from the init script instead.
Bug: https://bugs.gentoo.org/589212
Package-Manager: portage-2.3.0_p13
app-mobilephone/kannel/files/kannel-bearerbox.initd | 1 +
app-mobilephone/kannel/files/kannel-smsbox.initd | 1 +
app-mobilephone/kannel/files/kannel-wapbox.initd | 1 +
.../kannel/{kannel-1.5.0-r1.ebuild => kannel-1.5.0-r2.ebuild} | 2 +-
4 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/app-mobilephone/kannel/files/kannel-bearerbox.initd b/app-mobilephone/kannel/files/kannel-bearerbox.initd
index 14259d5..a37b084 100644
--- a/app-mobilephone/kannel/files/kannel-bearerbox.initd
+++ b/app-mobilephone/kannel/files/kannel-bearerbox.initd
@@ -19,6 +19,7 @@ checkconfig() {
start() {
checkconfig || return 1
+ checkpath -o root:kannel -m 0770 -d /var/run/kannel
ebegin "Starting kannel ${KANNEL_SERVICE}"
start-stop-daemon --start --quiet --exec /usr/sbin/${KANNEL_SERVICE} -- \
diff --git a/app-mobilephone/kannel/files/kannel-smsbox.initd b/app-mobilephone/kannel/files/kannel-smsbox.initd
index 73087e6..9ec5645 100644
--- a/app-mobilephone/kannel/files/kannel-smsbox.initd
+++ b/app-mobilephone/kannel/files/kannel-smsbox.initd
@@ -18,6 +18,7 @@ checkconfig() {
start() {
checkconfig || return 1
+ checkpath -o root:kannel -m 0770 -d /var/run/kannel
ebegin "Starting kannel ${KANNEL_SERVICE}"
start-stop-daemon --start --quiet --exec /usr/sbin/${KANNEL_SERVICE} -- \
diff --git a/app-mobilephone/kannel/files/kannel-wapbox.initd b/app-mobilephone/kannel/files/kannel-wapbox.initd
index 73087e6..9ec5645 100644
--- a/app-mobilephone/kannel/files/kannel-wapbox.initd
+++ b/app-mobilephone/kannel/files/kannel-wapbox.initd
@@ -18,6 +18,7 @@ checkconfig() {
start() {
checkconfig || return 1
+ checkpath -o root:kannel -m 0770 -d /var/run/kannel
ebegin "Starting kannel ${KANNEL_SERVICE}"
start-stop-daemon --start --quiet --exec /usr/sbin/${KANNEL_SERVICE} -- \
diff --git a/app-mobilephone/kannel/kannel-1.5.0-r1.ebuild b/app-mobilephone/kannel/kannel-1.5.0-r2.ebuild
similarity index 98%
rename from app-mobilephone/kannel/kannel-1.5.0-r1.ebuild
rename to app-mobilephone/kannel/kannel-1.5.0-r2.ebuild
index ee84be2..62a25f1 100644
--- a/app-mobilephone/kannel/kannel-1.5.0-r1.ebuild
+++ b/app-mobilephone/kannel/kannel-1.5.0-r2.ebuild
@@ -96,7 +96,7 @@ src_install() {
done
diropts -g kannel -m0770
- keepdir /var/log/kannel /var/run/kannel
+ keepdir /var/log/kannel
}
pkg_postinst() {
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-mobilephone/kannel/, app-mobilephone/kannel/files/
@ 2016-08-25 17:02 Pacho Ramos
0 siblings, 0 replies; 3+ messages in thread
From: Pacho Ramos @ 2016-08-25 17:02 UTC (permalink / raw
To: gentoo-commits
commit: f9f601a8838ce9a1eea2e2e90532fd7618fd9b13
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 25 17:01:57 2016 +0000
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Thu Aug 25 17:01:57 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f9f601a8
app-mobilephone/kannel: Fix starting with supplementary group ID's (#512500 by Ján Regeš).
Package-Manager: portage-2.3.0
.../kannel/files/kannel-1.5.0-initgroups.patch | 11 ++
app-mobilephone/kannel/kannel-1.5.0-r3.ebuild | 129 +++++++++++++++++++++
2 files changed, 140 insertions(+)
diff --git a/app-mobilephone/kannel/files/kannel-1.5.0-initgroups.patch b/app-mobilephone/kannel/files/kannel-1.5.0-initgroups.patch
new file mode 100644
index 00000000..665ca6d
--- /dev/null
+++ b/app-mobilephone/kannel/files/kannel-1.5.0-initgroups.patch
@@ -0,0 +1,11 @@
+--- a/gwlib/utils.c.old 2016-08-25 18:52:59.944949612 +0200
++++ b/gwlib/utils.c 2016-08-25 18:53:30.352659566 +0200
+@@ -387,7 +387,7 @@
+ }
+
+ #ifndef __INTERIX
+- if (initgroups(user, -1) == -1) {
++ if (initgroups(user, pass->pw_gid) == -1) {
+ error(errno, "Could not set supplementary group ID's.");
+ }
+ #endif
diff --git a/app-mobilephone/kannel/kannel-1.5.0-r3.ebuild b/app-mobilephone/kannel/kannel-1.5.0-r3.ebuild
new file mode 100644
index 00000000..c3f641e
--- /dev/null
+++ b/app-mobilephone/kannel/kannel-1.5.0-r3.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+WANT_AUTOMAKE=none
+
+inherit autotools flag-o-matic ssl-cert user
+
+DESCRIPTION="Powerful SMS and WAP gateway"
+HOMEPAGE="http://www.kannel.org/"
+SRC_URI="http://www.kannel.org/download/${PV}/gateway-${PV}.tar.gz"
+
+LICENSE="Apache-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug doc mysql libressl pam pcre postgres sqlite ssl"
+
+RESTRICT="test" # some tests fail with "address already in use"
+
+RDEPEND="
+ sys-libs/e2fsprogs-libs
+ dev-libs/libxml2:2
+ dev-lang/perl
+ sys-libs/zlib
+ ssl? (
+ libressl? ( dev-libs/libressl:0= )
+ !libressl? ( dev-libs/openssl:0= ) )
+ mysql? ( virtual/mysql )
+ sqlite? ( dev-db/sqlite:3 )
+ postgres? ( dev-db/postgresql:=[server] )
+ pcre? ( dev-libs/libpcre:3 )
+ pam? ( virtual/pam )
+"
+DEPEND="${RDEPEND}
+ >=sys-devel/bison-2.2
+ doc? ( media-gfx/transfig
+ app-text/jadetex
+ app-text/docbook-dsssl-stylesheets
+ app-text/docbook-sgml-dtd:3.1 )
+"
+
+S="${WORKDIR}/gateway-${PV}"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-1.5.0-custom-wap-ports.patch"
+ "${FILESDIR}/${PN}-1.4.3-autotools.patch"
+ "${FILESDIR}/${PN}-1.4.3-external-libuuid.patch"
+ "${FILESDIR}/${PN}-1.5.0-initgroups.patch"
+)
+
+pkg_setup() {
+ enewgroup kannel
+ enewuser kannel -1 -1 /var/log/kannel kannel
+}
+
+src_prepare() {
+ default
+
+ #by default, use current directory for logging
+ sed -i -e 's:/tmp/::' doc/examples/kannel.conf
+
+ mv configure.in configure.ac || die
+ eautoconf
+}
+
+src_configure() {
+ append-flags -fno-strict-aliasing # some code breaks strict aliasing
+ econf \
+ --enable-localtime \
+ --disable-start-stop-daemon \
+ --without-sqlite2 \
+ $(use_enable pam) \
+ $(use_enable debug debug) \
+ $(use_enable pcre) \
+ $(use_enable doc docs) \
+ $(use_enable ssl) \
+ $(use_with mysql) \
+ $(use_with sqlite sqlite3) \
+ $(use_with postgres pgsql)
+}
+
+# phase disabled by RESTRICT
+# src_test() {
+# emake check || die "emake check failed"
+# }
+
+src_install() {
+ default
+
+ if use doc; then
+ emake -j1 DESTDIR="${D}" install-docs || die "emake install-docs failed"
+ fi
+
+ diropts -g kannel -m0750
+ dodir /etc/kannel
+ insinto /etc/kannel
+ newins doc/examples/kannel.conf kannel.conf.sample
+
+ local f
+ for f in bearerbox smsbox wapbox; do
+ newinitd "${FILESDIR}/kannel-$f.initd" kannel-$f
+ done
+
+ diropts -g kannel -m0770
+ keepdir /var/log/kannel
+}
+
+pkg_postinst() {
+ if use ssl; then
+ elog "SSL certificate can be created by running"
+ elog " emerge --config =${CATEGORY}/${PF}"
+ fi
+}
+
+pkg_config() {
+ if use ssl; then
+ if install_cert /etc/ssl/kannel; then
+ chown kannel "${ROOT}"etc/ssl/kannel.{pem,key}
+ einfo "For using this certificate, you have to add following line to your kannel.conf:"
+ einfo ' ssl-client-certkey-file = "/etc/ssl/kannel.pem"'
+ einfo ' ssl-server-cert-file = "/etc/ssl/kannel.crt"'
+ einfo ' ssl-server-key-file = "/etc/ssl/kannel.key"'
+ fi
+ else
+ eerror "This phase exists only for creating kannel SSL certificate"
+ eerror "and ssl USE flag is disabled for this package!"
+ fi
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2016-08-25 17:02 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-04-26 22:27 [gentoo-commits] repo/gentoo:master commit in: app-mobilephone/kannel/, app-mobilephone/kannel/files/ Austin English
-- strict thread matches above, loose matches on Subject: below --
2016-07-20 14:56 Mike Gilbert
2016-08-25 17:02 Pacho Ramos
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox