rsyslog: update to 7.4.2; cross build support.

This commit is contained in:
Juan RP 2013-07-25 23:05:46 +02:00
parent 4bc707a313
commit a908103f24
2 changed files with 28 additions and 28 deletions

View File

@ -1,11 +0,0 @@
--- rsyslog.service.in.orig 2012-07-09 12:08:34.295681549 +0200
+++ rsyslog.service.in 2012-07-09 12:08:44.446952249 +0200
@@ -2,8 +2,7 @@
Description=System Logging Service
[Service]
-ExecStartPre=/bin/systemctl stop systemd-kmsg-syslogd.service
-ExecStart=@sbindir@/rsyslogd -n -c6
+ExecStart=@sbindir@/rsyslogd -n -c6 -i /run/rsyslogd.pid
Sockets=syslog.socket
StandardOutput=null

View File

@ -1,35 +1,48 @@
# Template file for 'rsyslog'
pkgname=rsyslog
version=6.4.2
revision=2
version=7.4.2
revision=1
build_style=gnu-configure
configure_args="--enable-gnutls --enable-mysql --enable-pgsql
--enable-imdiag --enable-imfile --enable-mail --enable-gssapi-krb5
--with-systemdsystemunitdir=/usr/lib/systemd/system --enable-zlib
--enable-imptcp --enable-imttcp --enable-mmsnmptrapd
--enable-impstats --enable-omprog --enable-omstdout
--enable-imptcp --enable-imttcp --enable-mmsnmptrapd --enable-omjournal
--enable-impstats --enable-omprog --enable-omstdout --enable-imjournal
--enable-pmlastmsg --enable-pmcisconames --enable-pmaixforwardedfrom
--enable-pmsnare --enable-pmrfc3164sd --enable-omuxsock"
makedepends="pkg-config gnutls-devel>=3.1.5 postgresql-libs-devel
libmysqlclient-devel>=5.5.27 mit-krb5-devel libee-devel>=0.4.0"
--enable-pmsnare --enable-pmrfc3164sd --enable-omuxsock
--enable-cached-man-pages
ac_cv_func_malloc_0_nonnull=yes ac_cv_func_realloc_0_nonnull=yes"
hostmakedepends="pkg-config"
makedepends="json-c-devel gnutls-devel>=3.1.5 postgresql-libs-devel
libmysqlclient-devel>=5.5.27 mit-krb5-devel libee-devel>=0.4.1
systemd-devel"
short_desc="An Enhanced multi-threaded syslog daemon"
maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-3"
homepage="http://www.rsyslog.com"
distfiles="${homepage}/files/download/rsyslog/$pkgname-$version.tar.gz"
checksum=ca92434c87f7390a5ea7ce6aea94c6cb05474bf778ec5d8ebc0b9a50f321749c
checksum=132827cc7c0202ebc88a0281c14866cf183ab3237d2e8dc10e9eb57ff83decbd
long_desc="
Rsyslog is an enhanced multi-threaded syslogd supporting, among
others, MySQL, PgSQL, syslog/tcp, RFC 3195, permitted sender lists,
filtering on any message part, and fine grain output format control."
if [ "$CROSS_BUILD" ]; then
hostmakedepends+=" libgcrypt-devel libmysqlclient-devel postgresql-libs-devel"
pre_configure() {
sed -e "s,\`mysql_config --cflags\`,\"-I$XBPS_CROSS_BASE/usr/include/mysql ${CFLAGS}\",g" -i configure
sed -e "s,\`mysql_config --libs\`,-L$XBPS_CROSS_BASE/usr/lib,g" -i configure
sed -e "s,\`pg_config --libdir\`,$XBPS_CROSS_BASE/usr/lib,g" -i configure
sed -e "s,\`pg_config --includedir\`,$XBPS_CROSS_BASE/usr/include,g" -i configure
}
fi
post_configure() {
echo "rsyslogd_LDADD += \$(LIBESTR_LIBS) -lm" >> tools/Makefile
}
post_install() {
vinstall ${FILESDIR}/rsyslog.conf 644 etc
vinstall ${FILESDIR}/rsyslog.logrotate 644 etc/logrotate.d rsyslog
# Install HTML documentation.
install -d ${DESTDIR}/usr/share/doc/rsyslog/html
install -m644 ${wrksrc}/doc/*.{html,png} \
@ -37,7 +50,7 @@ post_install() {
}
rsyslog-docs_package() {
short_desc="${sourcepkg} HTML documentation"
short_desc+=" - HTML documentation"
noarch=yes
pkg_install() {
vmove usr/share/doc
@ -46,7 +59,7 @@ rsyslog-docs_package() {
rsyslog-gssapi_package() {
depends="rsyslog"
short_desc="${sourcepkg} Kerberos5 GSSAPI add-on"
short_desc+=" - Kerberos5 GSSAPI add-on"
pkg_install() {
vmove "usr/lib/rsyslog/*gss*.so"
}
@ -54,7 +67,7 @@ rsyslog-gssapi_package() {
rsyslog-gnutls_package() {
depends="rsyslog"
short_desc="${sourcepkg} GnuTLS add-on"
short_desc+=" - GnuTLS add-on"
pkg_install() {
vmove "usr/lib/rsyslog/*gtls*"
}
@ -62,7 +75,7 @@ rsyslog-gnutls_package() {
rsyslog-mysql_package() {
depends="rsyslog"
short_desc="${sourcepkg} MySQL add-on"
short_desc+=" - MySQL add-on"
pkg_install() {
vmove usr/lib/rsyslog/ommysql.so
}
@ -70,21 +83,19 @@ rsyslog-mysql_package() {
rsyslog-postgresql_package() {
depends="rsyslog"
short_desc="${sourcepkg} PostgreSQL add-on"
short_desc+=" - PostgreSQL add-on"
pkg_install() {
vmove usr/lib/rsyslog/ompgsql.so
}
}
rsyslog_package() {
depends="libee>=0.4.0 systemd>=186"
conf_files="/etc/rsyslog.conf"
systemd_services="rsyslog.service on"
provides="syslog-daemon-0"
replaces="syslog-daemon>=0"
make_dirs="/etc/rsyslog.d 0755 root root"
pkg_install() {
vmove etc
vmove usr
vmove all
}
}