Merge remote branch 'clandmeter/master'

6 files changed, 138 insertions, 10 deletions

diff --git a/extra/net-snmp/APKBUILD b/extra/net-snmp/APKBUILD
new file mode 100644
index 0000000000..6a28088d57
--- /dev/null
+++ b/extra/net-snmp/APKBUILD
@@ -0,0 +1,57 @@
+# Contributor: Carlo Landmeter <clandmeter@gmail.com>
+# Maintainer: Carlo Landmeter <clandmeter@gmail.com>
+pkgname=net-snmp
+pkgver=5.4.2.1
+pkgrel=0
+pkgdesc="Simple Network Management Protocol"
+url="http://www.net-snmp.org/"
+license="GPL"
+depends="uclibc"
+makedepends=""
+subpackages="$pkgname-doc $pkgname-dev $pkgname-tools"
+source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz
+snmpd.initd
+snmpd.confd
+snmptrapd.initd
+snmptrapd.confd"
+
+build() {
+	cd "$srcdir/$pkgname-$pkgver"
+
+	export lt_cv_sys_max_cmd_len=8192
+
+	./configure --prefix=/usr \
+		--sysconfdir=/etc/snmp \
+		--mandir=/usr/share/man \
+		--infodir=/usr/share/info \
+		--with-default-snmp-version="3" \
+		--with-sys-contact="root@unknown" \
+		--with-sys-location="unknown" \
+		--with-logfile="/var/log/net-snmpd.log" \
+		--enable-ucd-snmp-compatibility \
+		--with-persistent-directory="/var/lib/net-snmp" \
+		--enable-shared \
+		--enable-as-needed
+
+	make -j1 || return 1
+	make -j1 DESTDIR="$pkgdir" install
+
+	install -m755 -D "$srcdir"/snmpd.initd "$pkgdir"/etc/init.d/snmpd
+	install -m644 -D "$srcdir"/snmpd.confd "$pkgdir"/etc/conf.d/snmpd
+        install -m755 -D "$srcdir"/snmptrapd.initd "$pkgdir"/etc/init.d/snmptrapd
+	install -m644 -D "$srcdir"/snmptrapd.confd "$pkgdir"/etc/conf.d/snmptrapd
+	install -m644 -D EXAMPLE.conf "$pkgdir"/etc/snmp/snmpd.conf.example
+	mkdir -p "$pkgdir"/var/lib/net-snmp
+}
+
+tools() {
+	mkdir -p "$subpkgdir"/usr
+	mv "$pkgdir"/usr/bin "$subpkgdir"/usr
+}
+
+
+md5sums="984932520143f0c8bf7b7ce1fc9e1da1  net-snmp-5.4.2.1.tar.gz
+941e257218aa773b33696a2c7222a14e  snmpd.initd
+96510a2f3bc9f21648b03f7e8d76c0d3  snmpd.confd
+c5198c350991637849595dba93019bda  snmptrapd.initd
+363f7728a76bdfc46e29b7e1f5cf4950  snmptrapd.confd"
diff --git a/extra/net-snmp/snmpd.confd b/extra/net-snmp/snmpd.confd
new file mode 100644
index 0000000000..ad48a1d94d
--- /dev/null
+++ b/extra/net-snmp/snmpd.confd
@@ -0,0 +1,14 @@
+# Initial (empty) options.
+OPTS=""
+
+# Enable connection logging.
+#SNMPD_FLAGS="${OPTS} -a"
+
+# Enable syslog and disable file log.
+#SNMPD_FLAGS="${OPTS} -Lsd -Lf /dev/null"
+
+# Enable agentx socket as /var/agentx/master
+# *NOTE* Before uncommenting this, make sure
+#        the /var/agentx directory exists.
+#SNMPD_FLAGS="${OPTS} -x /var/agentx/master"
+
diff --git a/extra/net-snmp/snmpd.initd b/extra/net-snmp/snmpd.initd
new file mode 100644
index 0000000000..49beda58d8
--- /dev/null
+++ b/extra/net-snmp/snmpd.initd
@@ -0,0 +1,30 @@
+#!/sbin/runscript
+
+NAME=snmpd
+DAEMON=/usr/sbin/$NAME
+
+depend() {
+	use logger
+	need net
+}
+
+checkconfig() {
+	if [ ! -e /etc/snmp/snmpd.conf ] ; then
+		eerror "You need an /etc/snmp/snmpd.conf config file to run snmpd"
+		return 1
+	fi
+}
+
+start() {
+	checkconfig || return 1
+	ebegin "Starting ${NAME}"
+		start-stop-daemon --start --quiet --background \
+			--exec ${DAEMON} -- -p /var/run/${NAME}.pid ${OPTS}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping ${NAME}"
+		start-stop-daemon --stop --quiet --pidfile /var/run/${NAME}.pid
+	eend $?
+}
diff --git a/extra/net-snmp/snmptrapd.confd b/extra/net-snmp/snmptrapd.confd
new file mode 100644
index 0000000000..d9cee614ea
--- /dev/null
+++ b/extra/net-snmp/snmptrapd.confd
@@ -0,0 +1,12 @@
+# extra flags to pass to snmptrapd
+OPTS=""
+
+# ignore authentication failure traps
+#SNMPTRAPD_FLAGS="${OPTS} -a"
+
+# log messages to specified file
+#SNMPTRAPD_FLAGS="${OPTS} -Lf /var/log/snmptrapd.log"
+
+# log messages to syslog with the specified facility
+# where facility is: 'd' = LOG_DAEMON, 'u' = LOG_USER, [0-7] = LOG_LOCAL[0-7]
+#SNMPTRAPD_FLAGS="${OPTS} -Ls d"
diff --git a/extra/net-snmp/snmptrapd.initd b/extra/net-snmp/snmptrapd.initd
new file mode 100644
index 0000000000..bf56233ab6
--- /dev/null
+++ b/extra/net-snmp/snmptrapd.initd
@@ -0,0 +1,22 @@
+#!/sbin/runscript
+
+NAME=snmptrapd
+DAEMON=/usr/sbin/$NAME
+
+depend() {
+	use logger
+	need net
+}
+
+start() {
+	ebegin "Starting ${NAME}"
+		start-stop-daemon --start --quiet --background \
+			--exec ${DAEMON} -- -p /var/run/${NAME}.pid ${OPTS}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping ${NAME}"
+		start-stop-daemon --stop --quiet --pidfile /var/run/${NAME}.pid
+	eend $?
+}
diff --git a/extra/transmission/APKBUILD b/extra/transmission/APKBUILD
index e2fe39a70e..a7796fc76b 100644
--- a/extra/transmission/APKBUILD
+++ b/extra/transmission/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer:Carlo Landmeter
 pkgname=transmission
-pkgver=1.34
+pkgver=1.51
 pkgel=0
 pkgdesc="Fast, easy, and fee BitToent client (CLI tools daemon and webinterface)"
 url="http://www.tansmissionbt.com"
@@ -9,7 +9,6 @@ license="MIT"
 depends="curl"
 makedepends="openssl-dev pkgconfig curl-dev"
 source="http://download.m0k.org/transmission/files/transmission-$pkgver.tar.bz2
-	transmission-1.34-configure-no-nls.patch
 	transmission-daemon.initd
 	transmission-daemon.confd
 	transmission.install
@@ -17,12 +16,7 @@ source="http://download.m0k.org/transmission/files/transmission-$pkgver.tar.bz2
 subpackages="$pkgname-doc"
 
 build() {
-        cd $srcdir/$pkgname-$pkgver
-
-	for i in ../*.patch; do
-		msg "Applying ${i##*/}"
-		patch -p1 -i $i || return 1
-	done
+        cd "$srcdir/$pkgname-$pkgver"
 
         ./configure --prefix=/usr \
 		--mandir=/usr/share/man \
@@ -33,8 +27,7 @@ build() {
         install -D -m755 "$srcdir"/transmission-daemon.initd "$pkgdir"/etc/init.d/transmission-daemon
         install -D -m644 "$srcdir"/transmission-daemon.confd "$pkgdir"/etc/conf.d/transmission-daemon
 }
-md5sums="c4ef93639bcb895c1b3d279b2f4e27b3  transmission-1.34.tar.bz2
-44b65993bb089851976386853e4128df  transmission-1.34-configure-no-nls.patch
+md5sums="b93439fbd0040ad6eb448f70a48355f5  transmission-1.51.tar.bz2
 b3b921242bdc3b33a8ac05fc30653b6c  transmission-daemon.initd
 89478a70fcd93463e1dd8d751da994da  transmission-daemon.confd
 4e338c4f7c902e132707b9e87b9bf1b5  transmission.install"