diff options
| -rw-r--r-- | package/libevent/Makefile | 21 | ||||
| -rw-r--r-- | package/net-snmp/Makefile | 2 | ||||
| -rw-r--r-- | package/net-snmp/files/snmpd.postinst | 2 | ||||
| -rw-r--r-- | package/tor/Makefile | 4 | ||||
| -rw-r--r-- | package/tor/files/tor.init | 4 | ||||
| -rw-r--r-- | package/tor/files/torrc | 2 |
6 files changed, 24 insertions, 11 deletions
diff --git a/package/libevent/Makefile b/package/libevent/Makefile index fb664f92f..829162b10 100644 --- a/package/libevent/Makefile +++ b/package/libevent/Makefile @@ -5,20 +5,33 @@ include $(TOPDIR)/rules.mk PKG_NAME:= libevent PKG_VERSION:= 1.3 -PKG_RELEASE:= 2 +PKG_RELEASE:= 3 PKG_MD5SUM:= d87b05143c6c2bc9464758e68e9c6e25 PKG_DESCR:= Event notification library for event-driven network servers PKG_SECTION:= libs -PKG_URL:= http://www.monkey.org/~provos +PKG_URL:= http://www.monkey.org/~provos/ PKG_SITES:= http://www.monkey.org/~provos/ +PKG_SUBPKGS:= LIBEVENT LIBEVENT_DEV +PKGSD_LIBEVENT_DEV:= development files for libevent +PKGSC_LIBEVENT_DEV:= devel + include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,LIBEVENT,${PKG_NAME},$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,LIBEVENT_DEV,libevent-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBEVENT_DEV},${PKGSC_LIBEVENT_DEV})) + +SUB_INSTALLS-y:= +SUB_INSTALLS-m:= +SUB_INSTALLS-${ADK_PACKAGE_LIBEVENT_DEV}+= libevent-dev-install -post-install: +post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y} $(INSTALL_DIR) $(IDIR_LIBEVENT)/usr/lib - $(CP) $(WRKINST)/usr/lib/libevent-$(PKG_VERSION).so* \ + $(CP) $(WRKINST)/usr/lib/libevent*.so* \ $(IDIR_LIBEVENT)/usr/lib/ +libevent-dev-install: + ${INSTALL_DIR} ${IDIR_LIBEVENT_DEV}/usr/include + ${CP} ${WRKINST}/usr/include/*.h ${IDIR_LIBEVENT_DEV}/usr/include + include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/net-snmp/Makefile b/package/net-snmp/Makefile index 96a78a1cf..38e7941c0 100644 --- a/package/net-snmp/Makefile +++ b/package/net-snmp/Makefile @@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= net-snmp PKG_VERSION:= 5.5 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= 5b2551e7bd024fbbee84dca22a5f13a1 PKG_DESCR:= SNMP Agent PKG_SECTION:= net/misc diff --git a/package/net-snmp/files/snmpd.postinst b/package/net-snmp/files/snmpd.postinst index d6af32a4f..d6fa70d67 100644 --- a/package/net-snmp/files/snmpd.postinst +++ b/package/net-snmp/files/snmpd.postinst @@ -1,4 +1,4 @@ #!/bin/sh . $IPKG_INSTROOT/etc/functions.sh add_rcconf snmpd -add_rcconf 'use "-Ls info" to log to syslog' snmpd_flags '-Ls info' +add_rcconf 'use "-Ls 1" to log to syslog' snmpd_flags '-Ls 1' diff --git a/package/tor/Makefile b/package/tor/Makefile index f7af0bfa6..9e6b6f045 100644 --- a/package/tor/Makefile +++ b/package/tor/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= tor -PKG_VERSION:= 0.2.1.24 +PKG_VERSION:= 0.2.1.27 PKG_RELEASE:= 1 -PKG_MD5SUM:= cb5629b2709ada82d34c22fef3ed77a9 +PKG_MD5SUM:= 1719642b3f25a23c3b3843ee99be18fb PKG_DESCR:= An anonymous Internet communication system PKG_SECTION:= proxy PKG_DEPENDS:= libevent libopenssl zlib libpthread diff --git a/package/tor/files/tor.init b/package/tor/files/tor.init index fcc8c144b..cbc395726 100644 --- a/package/tor/files/tor.init +++ b/package/tor/files/tor.init @@ -12,7 +12,9 @@ autostart) ;; start) [ -d /var/log/tor ] || mkdir -p /var/log/tor - tor + [ -d /tmp/.tor ] || mkdir -p /tmp/.tor + chown tor:tor /tmp/.tor + su - tor -c tor ;; stop) pkill tor diff --git a/package/tor/files/torrc b/package/tor/files/torrc index e5cf75b6e..3a46e8933 100644 --- a/package/tor/files/torrc +++ b/package/tor/files/torrc @@ -131,6 +131,4 @@ RunAsDaemon 1 #ExitPolicy accept *:119 # accept nntp as well as default exit policy #ExitPolicy reject *:* # middleman only -- no exits allowed -User tor -Group tor PidFile /var/run/tor.pid |