diff options
| -rw-r--r-- | main/syslog-ng/APKBUILD | 38 | ||||
| -rw-r--r-- | main/syslog-ng/syslog-ng-plugins.std | 6 | ||||
| -rw-r--r-- | main/syslog-ng/syslog-ng-source.std | 2 | ||||
| -rw-r--r-- | main/syslog-ng/syslog-ng.initd | 1 |
4 files changed, 34 insertions, 13 deletions
diff --git a/main/syslog-ng/APKBUILD b/main/syslog-ng/APKBUILD index fc7047dea8..b1485b576d 100644 --- a/main/syslog-ng/APKBUILD +++ b/main/syslog-ng/APKBUILD @@ -1,14 +1,14 @@ # Contributor: jv <jens@eisfair.org> # Maintainer: jv <jens@eisfair.org> pkgname=syslog-ng -pkgver=2.1.4 -pkgrel=3 +pkgver=3.6.2 +pkgrel=0 pkgdesc="Next generation logging daemon" url="http://www.balabit.com" arch="all" license="GPLv2" depends="" -depends_dev="glib-dev eventlog-dev" +depends_dev="glib-dev eventlog-dev pcre-dev" makedepends="$depends_dev" install="$pkgname.post-install" subpackages="" @@ -20,6 +20,7 @@ source="http://www.balabit.com/downloads/files/syslog-ng/open-source-edition/${p syslog-ng-filter.std syslog-ng-log.std syslog-ng-options.std + syslog-ng-plugins.std syslog-ng-source.std " @@ -33,6 +34,7 @@ build() { cd "$_builddir" ./configure --prefix=/usr \ --sysconfdir=/etc/syslog-ng \ + --localstatedir=/run \ --enable-ipv6 \ --disable-sql \ --disable-mongodb \ @@ -44,7 +46,16 @@ build() { package() { cd "$_builddir" make -j1 DESTDIR=${pkgdir} install || return 1 + rm -rf ${pkgdir}/etc/syslog-ng rm -rf ${pkgdir}/usr/share + rm -rf ${pkgdir}/usr/include + rm -rf ${pkgdir}/usr/lib/pkgconfig + rm -f ${pkgdir}/usr/lib/*.la + rm -f ${pkgdir}/usr/lib/libsyslog-ng.so + rm -f ${pkgdir}/usr/lib/$pkgname/*.la + rm -rf ${pkgdir}/usr/lib/$pkgname/libtest + rm -f ${pkgdir}/usr/lib/libsyslog-ng.so + rm -rf ${pkgdir}/run install -D -m755 "$srcdir"/$pkgname.initd ${pkgdir}/etc/init.d/$pkgname || return 1 install -D -m644 "$srcdir"/syslog-ng-destination.std ${pkgdir}/etc/syslog-ng/syslog-ng-destination.std || return 1 install -D -m644 "$srcdir"/syslog-ng-filter.std ${pkgdir}/etc/syslog-ng/syslog-ng-filter.std || return 1 @@ -54,27 +65,30 @@ package() { install -D -m644 "$srcdir"/syslog-ng.logrotate ${pkgdir}/etc/logrotate.d/syslog-ng || return 1 } -md5sums="17c4c7725d2eab62b588395f1ed93f32 syslog-ng_2.1.4.tar.gz +md5sums="6928e9be3499a2e9ae52ea8aa204b165 syslog-ng_3.6.2.tar.gz 8916d55f8213d2746e8c2a6a89c29d6c syslog-ng.logrotate -fabdf3497cd68ff2245a63aa31101ff9 syslog-ng.initd +8b6b5800231de6b8ae126e07f0dc222c syslog-ng.initd f0b4a0b530e269c51bc63f5b9d817c9b syslog-ng-destination.std 405f4730412fec3a170460d724a6b50e syslog-ng-filter.std bc676f733ea162ea4de7a8c2a16c06ed syslog-ng-log.std f15a2b7c8496038c29d3ca7adc8d4054 syslog-ng-options.std -8c166661270cd8459897ca3df06066c9 syslog-ng-source.std" -sha256sums="e2189c7dbf617f2fc883ab0a8a86100dbe7cb4853c6b39732d77e73f335b0502 syslog-ng_2.1.4.tar.gz +5b54d79cb535f20a8524ea70f6f87ffb syslog-ng-plugins.std +d1b01c819861945675a6e2fcff8d9a2c syslog-ng-source.std" +sha256sums="ef47fada52981e09af570457a5af30f815f5d5b6c2e33754cedd4ca9780d8261 syslog-ng_3.6.2.tar.gz a886b65863d72476504165e6a6dfe3d2922945d8cb61adb6b8eec73ac35d825e syslog-ng.logrotate -cedef260645692952c3f674bfc42117364dd1c1e9837f45b10faa46afb670c31 syslog-ng.initd +f405204a93e220a7b228bbb9b3ff6f8d767a449f27f3c387ca41c014d7f22efd syslog-ng.initd bd3097c1d8ff6754df0d7e470659827ae4d6bf86976badf5aabe4d25504fd572 syslog-ng-destination.std 4ee19a76624624a9742f3399887784a55f684d141e115996b82c593aa74dcb66 syslog-ng-filter.std df30f0ce37bdf8cc0ac0fcc04800d7d14880bf3a19d01ab96220a325f1ab3943 syslog-ng-log.std 8d925e7272a8d7dbda42694fe0e9c6fdc1bee6ffd9d4adf78e0ebb183658d4d4 syslog-ng-options.std -51399e8d5d3a2d7b2d30f4adefe92776c9ddcae98d5189af9ddae1d2e66db8f3 syslog-ng-source.std" -sha512sums="5ff5e3a36dbcb99a3b1b36cda3336764290bd9251379244f10a48bd396785d16ed9200d746acb66f69f471d9ce1e8ec2e337afdadd109d7eba0c12d0de403ae0 syslog-ng_2.1.4.tar.gz +6f052e1cc3523b0d23696b450058e4bfee89cb75eb9039cc405eded79c996aa1 syslog-ng-plugins.std +0f3ea572b98d21f3afd82d64b17d518d6584b2ea4bfe96df2c1aa9c648890014 syslog-ng-source.std" +sha512sums="15603b4df2001e1ce7e0019d0dd9a0f4295445e3fd19a527ebf3d49486da7da27fac6c465727ec0354f8f70ca0f671a285ec132f9aa0de62b40f18b44af2a226 syslog-ng_3.6.2.tar.gz a062d1601f5215f60e2fc40c6ca498d768aa97af3647a9468731123a28fdd67962421b4412bfbe08a1123141b730cb78f102230ab72befec05ba7f398b39e27a syslog-ng.logrotate -c2f8c8503ebf6b9bbb159e1e6327780b45b86612960ce00bc74404a0da46b7fb396484dfcf6aea06b9b424b2caf9e2a5bd982fcca3c8970773b777e595619128 syslog-ng.initd +a16b7145057d5d6cbe0f5d0d1b1c14d1d375b57e0f045ec0c808e0ddfb714f017ea484812c57216beac826597b31caa5a09e33287929af58018a614a8c53a798 syslog-ng.initd b51d8b3da9584b6cb5b5c023b5ca1085d8e4c2cfa56f6ed12fe6feb0f33a390b43825aaaf4dd74eb6b7765485fe42f7f21c74380b72de9ed2c7775787ab1e720 syslog-ng-destination.std e04a70a0b8fc4f40951c9b608b0dede1fa561dd7f58ce8fd8bac70b578b749d15d202973fd9de9fe494656ee138ef5efd32ea6229e6ec0a2f19672dd621acc91 syslog-ng-filter.std d7864f6666101e0818dd0178a4d1ada2417280de153ff916fe4879348a37b7bfab5936e86629dc52e4edf82fbd601e04d08ed5a2117bcb0470a3d5884add9f55 syslog-ng-log.std 9f4224faf45c73daa54549aebf20e2c45d0bf533a20d2ad97d7258490ce793c8b08cc34cac2a89d185e936515096eb93c793018986c8d21861d88c4b0005d16a syslog-ng-options.std -fe4e4921426ea58186d1fbc54d36a2ba7a88992e7b1ce9b1a41470e4f791b6c7850d34785ec458d2793399b8de1a25ef2b290a95437083fd350b3925d11b9aea syslog-ng-source.std" +9dd65da6a805aa709441ec8080789b2d0aba7a773ed91c807c39d2b0d82dd9cf3ac014f357ec6f45038db8d5c162e04179821437662d7ece35872204fbf44cf6 syslog-ng-plugins.std +42cc7728a182fee30675aefee9055eb14bdfbf2006bcf1c731864221ea494ad82d9ae4417190ff18da4a663fa9d5efcd514b6e64a568e228cfed1fb2abd2b10c syslog-ng-source.std" diff --git a/main/syslog-ng/syslog-ng-plugins.std b/main/syslog-ng/syslog-ng-plugins.std new file mode 100644 index 0000000000..e130ab31fc --- /dev/null +++ b/main/syslog-ng/syslog-ng-plugins.std @@ -0,0 +1,6 @@ +# --------------------------------------------------------------------------------- +# Default syslog-ng plugins; Do not edit this file! +# append source with line on a file: syslog-ng-plugins.<package> +# --------------------------------------------------------------------------------- +# version +@version: 3.6 diff --git a/main/syslog-ng/syslog-ng-source.std b/main/syslog-ng/syslog-ng-source.std index 80a25feb0b..95832ff6e7 100644 --- a/main/syslog-ng/syslog-ng-source.std +++ b/main/syslog-ng/syslog-ng-source.std @@ -7,4 +7,4 @@ # standard Linux log source (this is the default place for the syslog() function to send logs to) unix-dgram("/dev/log"); # messages from the kernel - file("/proc/kmsg" log_prefix("kernel: ")); + file("/proc/kmsg" program_override("kernel")); diff --git a/main/syslog-ng/syslog-ng.initd b/main/syslog-ng/syslog-ng.initd index 4b26fc247d..c558a39deb 100644 --- a/main/syslog-ng/syslog-ng.initd +++ b/main/syslog-ng/syslog-ng.initd @@ -57,6 +57,7 @@ update() { done { # create options entries + grep_syslog_conf_entries plugins echo "options {" grep_syslog_conf_entries options echo "};" |