diff options
| author | Michael Mason <ms13sp@gmail.com> | 2010-02-03 14:19:58 +0000 |
|---|---|---|
| committer | Michael Mason <ms13sp@gmail.com> | 2010-02-03 14:19:58 +0000 |
| commit | 4c9beb2cdb88f540b188bc7ba21562e67088e979 (patch) | |
| tree | 567fac5d5a83fc9d934b13837b8f43ddee8ad53b /main | |
| parent | 21bf45a4d039c8978fada6c93095b5a3f43f561d (diff) | |
| parent | 53f078975d6c0ab137740eb66a2b19b83c4d7976 (diff) | |
| download | aports-4c9beb2cdb88f540b188bc7ba21562e67088e979.tar.bz2 aports-4c9beb2cdb88f540b188bc7ba21562e67088e979.tar.xz | |
Merge branch 'master' of git://git.alpinelinux.org/aports
Diffstat (limited to 'main')
41 files changed, 1068 insertions, 201 deletions
diff --git a/main/acct/APKBUILD b/main/acct/APKBUILD index 29657feed9..c4a68c67bb 100644 --- a/main/acct/APKBUILD +++ b/main/acct/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Carlo Landmeter <clandmeter@gmail.com> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=acct -pkgver=6.3.2 -pkgrel=1 +pkgver=6.5.3 +pkgrel=0 pkgdesc="The GNU Accounting Utilities" url="http://www.gnu.org/software/acct/" license="GPL" @@ -18,10 +18,15 @@ build() { # seems like this makefile does not respect DESTDIR ./configure --prefix=/usr \ --mandir="$pkgdir"/usr/share/man \ - --infodir="$pkgdir"/usr/share/info + --infodir="$pkgdir"/usr/share/info \ + --enable-linux-multiformat - make || return 1 + make LDADD="-lm lib/libgnu.la" || return 1 +} + +package() { + cd "$srcdir/$pkgname-$pkgver" make prefix="$pkgdir/usr" install } -md5sums="da0055b254f7da8b8920db83ef1ebba1 acct-6.3.2.tar.gz" +md5sums="0d4121b4ca76792b17d76042577c04ce acct-6.5.3.tar.gz" diff --git a/main/acf-openssh/APKBUILD b/main/acf-openssh/APKBUILD index 5dcad94abb..953c13297f 100644 --- a/main/acf-openssh/APKBUILD +++ b/main/acf-openssh/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=acf-openssh -pkgver=0.4.0 +pkgver=0.4.1 pkgrel=0 pkgdesc="A web-based system administration interface for openssh" url="http://git.alpinelinux.org/cgit/acf-openssh" @@ -12,4 +12,4 @@ build() { cd "$srcdir/$pkgname-$pkgver" make DESTDIR="$pkgdir" install } -md5sums="e3b747b7057960adaac1631eee017641 acf-openssh-0.4.0.tar.bz2" +md5sums="85b8541cb0c53ac719ca0c8fea553a11 acf-openssh-0.4.1.tar.bz2" diff --git a/main/dhcpcd/APKBUILD b/main/dhcpcd/APKBUILD index 4aceb88b70..263b41569c 100644 --- a/main/dhcpcd/APKBUILD +++ b/main/dhcpcd/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Michael Mason <ms13sp@gmail.com> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=dhcpcd -pkgver=5.1.4 +pkgver=5.1.5 pkgrel=0 pkgdesc="RFC2131 compliant DHCP client" url="http://roy.marples.name/projects/dhcpcd/" @@ -25,4 +25,4 @@ package() { make DESTDIR="$pkgdir" install } -md5sums="d18afc66efbea9a28e541e9b10fd284f dhcpcd-5.1.4.tar.bz2" +md5sums="a0b917dfd03b6416386bca06dd219d9b dhcpcd-5.1.5.tar.bz2" diff --git a/main/fprobe/APKBUILD b/main/fprobe/APKBUILD new file mode 100644 index 0000000000..824129afe5 --- /dev/null +++ b/main/fprobe/APKBUILD @@ -0,0 +1,36 @@ +# Contributor: Carlo Landmeter <clandmeter@gmail.com> +# Maintainer: Carlo Landmeter <clandmeter@gmail.com> +pkgname=fprobe +pkgver=1.1 +pkgrel=2 +pkgdesc="libpcap-based tool that collect network traffic" +url="http://fprobe.sourceforge.net/" +license="GPL" +depends= +makedepends="libpcap-dev" +subpackages="$pkgname-doc" +source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2 +$pkgname.initd +$pkgname.confd" + +_builddir="$srcdir"/$pkgname-$pkgver +build() { + cd "$_builddir" + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --infodir=/usr/share/info + make || return 1 +} + +package() { + cd "$_builddir" + make DESTDIR="$pkgdir" install + + install -m755 -D "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname + install -m644 -D "$srcdir"/$pkgname.confd "$pkgdir"/etc/conf.d/$pkgname +} + +md5sums="65850d0470078269b33eee58cba77ac2 fprobe-1.1.tar.bz2 +41810a73503624de2c27809e34ed80b4 fprobe.initd +ba9c9327456e4db897b60481705df282 fprobe.confd" diff --git a/main/fprobe/fprobe.confd b/main/fprobe/fprobe.confd new file mode 100644 index 0000000000..1c444f554e --- /dev/null +++ b/main/fprobe/fprobe.confd @@ -0,0 +1,70 @@ +# Config file for /etc/init.d/fprobe + +# Do we want the interface in promiscous mode [yes/no] +#PROMISC=no + +# Interface +IFACE=eth0 + +# If configured, only capture packets matching this tcpdump expression +#FILTER="" + +# Flow state timers +#TIMER_EXPIRED=5 +#TIMER_FRAGMENTED=30 +#TIMER_IDLE=60 +#TIMER_ACTIVE=300 + +# This is the default and should be left unless you know what you are doing +#FLOW_VER=5 + +# local ip. if configured fprobe will use this as the source IP for sending ALL flow data +# If you want to specify a specific source address per collecter, customize it below +#LOCALIP= + +# SNMP iface id +SNMP_IFACE="${IFACE//eth}" + +# Maximum number of concurrent flows to track +# using a specified amount of memory +#MEMBULK=10000 +#MEMLIMIT= + +# Pending queue +#PENDING=100 + +# Kernel capture buffer size (kB) +#KERNBUF=1024 + +# Realtime priority [0=disabled, 1..99] +#RTPRIO=0 + +# Delay N nanoseconds after each B bytes +#DELAY="0:0" + +# How much of the start of each packet to grab +#SNAPLEN=256 + +# chroot() to this location after startup +CHROOT="/var/empty" + +# User to run as. must have perms to the pidfile directory /var/run/fprobe/ +USER=nobody + +# logging level for syslog (0=EMERG, ..., 6=INFO, 7=DEBUG) +#LOGLEVEL=6 + +# If you want to run multiple instances of fprobe, +# You MUST set this variable to a unique INTEGER for each one! +PIDFILE_ID='' + +# remote ip. this is where we send flows +REMOTEIP=127.0.0.1 +# port to listen on +PORT=2055 +# Collector type, see the manpage for valid types +TYPE='' + +# If you want multiple collectors, just specify each one here +COLLECTORS="${REMOTEIP}:${PORT}/${LOCALIP}/${TYPE}" + diff --git a/main/fprobe/fprobe.initd b/main/fprobe/fprobe.initd new file mode 100644 index 0000000000..a14f1e6bcc --- /dev/null +++ b/main/fprobe/fprobe.initd @@ -0,0 +1,40 @@ +#!/sbin/runscript +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +depend() { + need net + after firewall +} + +BIN=/usr/sbin/fprobe +PIDFILE_EXTRA="" +[ -n "$PIDFILE_ID" ] && PIDFILE_EXTRA="[$PIDFILE_ID]" +PIDFILE="/var/run/fprobe$PIDFILE_EXTRA.pid" + +start() { + ebegin "Starting fprobe" + local OPTS="" + [ "${PROMISC}" == "yes" ] || OPTS="${OPTS} -p" + [ -n "${FILTER}" ] && OPTS="${OPTS} -f '${FILTER}'" + for optname in i:IFACE s:TIMER_EXPIRED g:TIME_FRAGMENTED d:TIMER_IDLE \ + e:TIMER_ACTIVE n:FLOW_VER a:LOCALIP x:SNMP_IFACE b:MEMBULK \ + m:MEMLIMIT q:PENDING B:KERNBUF r:RTPRIO t:DELAY S:SNAPLEN \ + c:CHROOT u:USER v:LOGLEVEL ; do + opt="${optname/:*}" optvar="${optname/*:}" + eval optvalue="\$$optvar" + [ -n "$optvalue" ] && OPTS="${OPTS} -${opt} ${optvalue}" + done + OPTS="${OPTS} -l 1:${PIDFILE_ID} ${COLLECTORS}" + start-stop-daemon --start --exec $BIN \ + --pidfile ${PIDFILE} \ + -- ${OPTS} + eend $? +} + +stop() { + ebegin "Stopping fprobe" + start-stop-daemon --stop --quiet --exec $BIN \ + --pidfile ${PIDFILE} + eend $? +} diff --git a/main/heimdal/APKBUILD b/main/heimdal/APKBUILD index 911b05f007..139539e195 100644 --- a/main/heimdal/APKBUILD +++ b/main/heimdal/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> pkgname=heimdal pkgver=1.3.1 -pkgrel=2 +pkgrel=3 pkgdesc="An implementation of Kerberos 5" url="http://www.h5l.org/" license="BSD" @@ -77,7 +77,6 @@ package() { install -m755 -D ../../heimdal-kdc.init ${pkgdir}/etc/init.d/heimdal-kdc install -m755 -D ../../heimdal-kpasswdd.init ${pkgdir}/etc/init.d/heimdal-kpasswdd - rm -f "$pkgdir"/usr/bin/compile_et "$pkgdir"/usr/share/man/man1/compile_et.1 # Remove editline, we use libreadline #rm ${pkgdir}/usr/lib/libeditline.* || return 1 #rm ${pkgdir}/usr/include/editline.h || return 1 @@ -96,20 +95,35 @@ package() { fi mv ${pkgdir}/usr/bin/${i} ${pkgdir}/usr/bin/k${i} || return 1 done - rm -rf ${pkgdir}/usr/share/man/cat{1,3,5,8} + for i in 1 3 5 8; do + rm -rf "$pkgdir"/usr/share/man/cat$i + done # Remove conflicts - rm ${pkgdir}/usr/share/man/man5/ftpusers.5* + # e2fsprogs + rm -f "$pkgdir"/usr/bin/compile_et \ + "$pkgdir"/usr/share/man/man1/compile_et.1 + # man-page + rm "$pkgdir"/usr/share/man/man5/ftpusers.5* + # openssl + rm "$pkgdir"/usr/share/man/man3/DES* + rm "$pkgdir"/usr/share/man/man3/DH* + rm "$pkgdir"/usr/share/man/man3/EVP* + rm "$pkgdir"/usr/share/man/man3/OpenSSL* + rm "$pkgdir"/usr/share/man/man3/RAND* + rm "$pkgdir"/usr/share/man/man3/RSA* + # erlang + rm "$pkgdir"/usr/share/man/man3/os.3* # Compress info pages for page in heimdal hx509; do - gzip -9 ${pkgdir}/usr/share/info/${page}.info + gzip -9 "$pkgdir"/usr/share/info/${page}.info done # Install the license - install -d ${pkgdir}/usr/share/licenses/${pkgname} - install -D -m644 ${srcdir}/${pkgname}-${pkgver}/LICENSE \ - ${pkgdir}/usr/share/licenses/${pkgname}/ || return 1 + install -d "$pkgdir"/usr/share/licenses/$pkgname + install -D -m644 "$srcdir"/$pkgname-$pkgver/LICENSE \ + "$pkgdir"/usr/share/licenses/$pkgname/ || return 1 } ftp() { diff --git a/main/hostapd/APKBUILD b/main/hostapd/APKBUILD new file mode 100644 index 0000000000..0c1c8c918f --- /dev/null +++ b/main/hostapd/APKBUILD @@ -0,0 +1,110 @@ +# Maintainer: Natanael Copa <ncopa@alpinelinux.org> +pkgname=hostapd +pkgver=0.6.9 +pkgrel=1 +pkgdesc="daemon for wireless software access points" +url="http://hostap.epitest.fi/hostapd/" +license="custom" +depends= +makedepends="openssl-dev libnl-dev" +install= +subpackages="$pkgname-doc" +source="http://hostap.epitest.fi/releases/$pkgname-$pkgver.tar.gz + $pkgname.initd + $pkgname.confd" + + +_builddir="$srcdir"/$pkgname-$pkgver/hostapd + +prepare() { + local conf="$_builddir/.config" + + cd "$_builddir" + sed -i -e "s:/etc/hostapd:/etc/hostapd/hostapd:g" \ + hostapd.conf + + # toolchain setup + echo "CC = $CC" > $conf + + # EAP authentication methods + echo "CONFIG_EAP=y" >> $conf + echo "CONFIG_EAP_MD5=y" >> $conf + + # SSL authentication methods + echo "CONFIG_EAP_TLS=y" >> $conf + echo "CONFIG_EAP_TTLS=y" >> $conf + echo "CONFIG_EAP_MSCHAPV2=y" >> $conf + echo "CONFIG_EAP_PEAP=y" >> $conf + + # Enable Wi-Fi Protected Setup + echo "CONFIG_WPS=y" >> $conf + echo "CONFIG_WPS_UPNP=y" >> $conf + + echo "CONFIG_EAP_GTC=y" >> $conf + echo "CONFIG_EAP_SIM=y" >> $conf + echo "CONFIG_EAP_AKA=y" >> $conf + echo "CONFIG_EAP_PAX=y" >> $conf + echo "CONFIG_EAP_PSK=y" >> $conf + echo "CONFIG_EAP_SAKE=y" >> $conf + echo "CONFIG_EAP_GPSK=y" >> $conf + echo "CONFIG_EAP_GPSK_SHA256=y" >> $conf + + # drivers + echo "CONFIG_DRIVER_HOSTAP=y" >> $conf + echo "CONFIG_DRIVER_WIRED=y" >> $conf + echo "CONFIG_DRIVER_PRISM54=y" >> $conf + + # Add include path for madwifi-driver headers +# echo "CFLAGS += -I/usr/include/madwifi" >> $conf +# echo "CONFIG_DRIVER_MADWIFI=y" >> $conf + + # enable nl80211 driver" + echo "CONFIG_DRIVER_NL80211=y" >> $conf + echo "CFLAGS += -I/usr/include/netlink" >> $conf + echo "LIBS += -L/usr/lib" >> $conf + + # misc + echo "CONFIG_PKCS12=y" >> $conf + echo "CONFIG_RADIUS_SERVER=y" >> $conf + echo "CONFIG_IAPP=y" >> $conf + echo "CONFIG_IEEE80211R=y" >> $conf + echo "CONFIG_IEEE80211W=y" >> $conf + echo "CONFIG_IEEE80211N=y" >> $conf + echo "CONFIG_PEERKEY=y" >> $conf + echo "CONFIG_RSN_PREAUTH=y" >> $conf + + # IPv6 support + echo "CONFIG_IPV6=y" >> $conf +} + +build() { + cd "$_builddir" + make || return 1 + + make nt_password_hash || return 1 + make hlr_auc_gw || return 1 +} + +package() { + cd "$_builddir" + install -d "$pkgdir"/etc/hostapd + install hostapd.conf hostapd.accept hostapd.deny hostapd.eap_user \ + hostapd.radius_clients hostapd.sim_db hostapd.wpa_psk \ + "$pkgdir"/etc/hostapd/ + + install -Dm755 hostapd "$pkgdir"/usr/sbin/hostapd + install -Dm755 hostapd_cli "$pkgdir"/usr/bin/hostapd_cli + + install -Dm755 nt_password_hash "$pkgdir"/usr/bin/nt_password_hash + install -Dm755 hlr_auc_gw "$pkgdir"/usr/bin/hlr_auc_gw + + install -Dm755 "$srcdir"/hostapd.initd "$pkgdir"/etc/init.d/hostapd + install -Dm644 "$srcdir"/hostapd.confd "$pkgdir"/etc/conf.d/hostapd + + install -Dm644 hostapd.8 "$pkgdir"/usr/share/man/man8/hostapd.8 + install -Dm644 hostapd_cli.1 "$pkgdir"/usr/share/man/man1/hostapd_cli +} + +md5sums="83630d11fa66ade9091f1b304fccd74c hostapd-0.6.9.tar.gz +fdbc94a99eca18f51294b5a96136ffdf hostapd.initd +c91382209042defa04e79d0ae841a29e hostapd.confd" diff --git a/main/hostapd/hostapd.confd b/main/hostapd/hostapd.confd new file mode 100644 index 0000000000..60381153aa --- /dev/null +++ b/main/hostapd/hostapd.confd @@ -0,0 +1,5 @@ +# Space separated list of configuration files +CONFIGS="/etc/hostapd/hostapd.conf" + +# Extra options to pass to hostapd, see hostapd(8) +OPTIONS="" diff --git a/main/hostapd/hostapd.initd b/main/hostapd/hostapd.initd new file mode 100644 index 0000000000..cbf962d8d1 --- /dev/null +++ b/main/hostapd/hostapd.initd @@ -0,0 +1,46 @@ +#!/sbin/runscript +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostapd/files/hostapd-0.6.9-init.d,v 1.2 2009/05/17 10:18:18 gurligebis Exp $ + +opts="start stop reload" + +depend() { + need net + after firewall + use logger +} + +checkconfig() { + local file + + for file in ${CONFIGS}; do + if [ ! -r "${file}" ]; then + eerror "hostapd configuration file (${CONFIG}) not found" + return 1 + fi + done +} + +start() { + checkconfig || return 1 + + ebegin "Starting ${SVCNAME}" + start-stop-daemon --start --exec /usr/sbin/hostapd \ + -- -B ${OPTIONS} ${CONFIGS} + eend $? +} + +stop() { + ebegin "Stopping ${SVCNAME}" + start-stop-daemon --stop --exec /usr/sbin/hostapd + eend $? +} + +reload() { + checkconfig || return 1 + + ebegin "Reloading ${SVCNAME} configuration" + kill -HUP $(pidof /usr/sbin/hostapd) > /dev/null 2>&1 + eend $? +} diff --git a/main/lua-openrc/APKBUILD b/main/lua-openrc/APKBUILD new file mode 100644 index 0000000000..56578c4002 --- /dev/null +++ b/main/lua-openrc/APKBUILD @@ -0,0 +1,32 @@ +# Contributor: +# Maintainer: +pkgname=lua-openrc +pkgver=0.1 +pkgrel=0 +pkgdesc="Lua module for OpenRC" +url="http://git.alpinelinux.org/cgit/lua-openrc/" +license="GPL" +depends=lua +makedepends="lua-dev openrc-dev" +install= +subpackages= +source="http://git.alpinelinux.org/cgit/lua-openrc/snapshot/lua-openrc-$pkgver.tar.bz2" + + +_builddir="$srcdir"/$pkgname-$pkgver + +prepare() { + cd "$_builddir" +} + +build() { + cd "$_builddir" + make || return 1 +} + +package() { + cd "$_builddir" + install -Dm755 rc.so "$pkgdir"/usr/lib/lua/5.1/rc.so +} + +md5sums="9a9ace6b5567179852b1ee04196a0ec3 lua-openrc-0.1.tar.bz2" diff --git a/main/lua-zlib/APKBUILD b/main/lua-zlib/APKBUILD new file mode 100644 index 0000000000..6f319b4864 --- /dev/null +++ b/main/lua-zlib/APKBUILD @@ -0,0 +1,35 @@ +# Contributor: +# Maintainer: +pkgname=lua-zlib +_name=lzlib +pkgver=0.4 +_ver=$pkgver-work2 +pkgrel=0 +pkgdesc="Lua bindings to the ZLib compression library" +url="http://luaforge.net/projects/lzlib/" +license="MIT" +depends="lua" +makedepends="lua-dev zlib-dev" +install= +subpackages= +source="http://luaforge.net/frs/download.php/3826/lzlib-$_ver.tar.gz" + +_builddir="$srcdir"/$_name-$_ver + +prepare() { + cd "$_builddir" + # apply patches here +} + +build() { + cd "$_builddir" + make || return 1 +} + +package() { + cd "$_builddir" + install -Dm755 zlib.so "$pkgdir"/usr/lib/lua/5.1/zlib.so + install -Dm644 gzip.lua "$pkgdir"/usr/share/lua/5.1/gzip.lua +} + +md5sums="9d29ec26d3ccbd86ea4d95dcc602911a lzlib-0.4-work2.tar.gz" diff --git a/main/minicom/APKBUILD b/main/minicom/APKBUILD new file mode 100644 index 0000000000..c419a9dc8b --- /dev/null +++ b/main/minicom/APKBUILD @@ -0,0 +1,31 @@ +# Contributor: Michael Mason <ms13sp@gmail.com> +# Maintainer: Michael Mason <ms13sp@gmail.com> +pkgname=minicom +pkgver=2.3 +pkgrel=1 +pkgdesc="menu driven communications program for terminals" +url="http://alioth.debian.org/projects/minicom" +license="GPL" +depends= +makedepends="ncurses-dev" +install= +subpackages="$pkgname-doc" +source="http://alioth.debian.org/frs/download.php/2332/$pkgname-$pkgver.tar.gz" + +_builddir="$srcdir"/$pkgname-$pkgver +build() { + cd "$_builddir" + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --infodir=/usr/share/info \ + --without-libintl-prefix + make || return 1 +} + +package() { + cd "$_builddir" + make DESTDIR="$pkgdir" install +} + +md5sums="0ebe7a91898384ca906787cc4e2c3f25 minicom-2.3.tar.gz" diff --git a/main/mysql/APKBUILD b/main/mysql/APKBUILD index 95f8e5e5c1..c5e170a64a 100644 --- a/main/mysql/APKBUILD +++ b/main/mysql/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Carlo Landmeter <clandmeter@gmail.com> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=mysql -pkgver=5.1.42 +pkgver=5.1.43 pkgrel=0 pkgdesc="A fast SQL database server" url="http://www.mysql.com/" @@ -72,6 +72,6 @@ client() { done } -md5sums="b644b219e130b7c6bca81948f75d72d7 mysql-5.1.42.tar.gz +md5sums="451fd3e8c55eecdf4c3ed109dce62f01 mysql-5.1.43.tar.gz 25d08b02bff6aa379dc45859b7a3f28a mysql.initd 15a7e3ddd6a40bf5a1eb3a8c69d9c34c mysql.mycnf" diff --git a/main/nmap/APKBUILD b/main/nmap/APKBUILD index 0196168b52..d97acd7a75 100644 --- a/main/nmap/APKBUILD +++ b/main/nmap/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Leonardo Arena <rnalrd@gmail.com> # Maintainer: Leonardo Arena <rnalrd@gmail.com> pkgname=nmap -pkgver=5.20 -pkgrel=1 +pkgver=5.21 +pkgrel=0 pkgdesc="A network exploration tool and security/port scanner" url="http:/nmap.org" license="custom:GPL" @@ -34,12 +34,4 @@ package() { install -D -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE } -nse() { - pkgdesc="nmap scripting engine" - mkdir -p "$subpkgdir"/usr/share/$pkgname - mv "$pkgdir"/usr/share/$pkgname/nselib \ - "$pkgdir"/usr/share/$pkgname/scripts \ - "$subpkgdir"/usr/share/$pkgname/ -} - -md5sums="ed8567c898c6b8f285fb7bebae449a1c nmap-5.20.tgz" +md5sums="8ce773d70a65007452161e0bde32990c nmap-5.21.tgz" diff --git a/main/openvpn/APKBUILD b/main/openvpn/APKBUILD index a8f1e18ff2..bd751f3111 100644 --- a/main/openvpn/APKBUILD +++ b/main/openvpn/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=openvpn -pkgver=2.0.9 -pkgrel=2 +pkgver=2.1.1 +pkgrel=0 pkgdesc="A robust, and highly configurable VPN (Virtual Private Network)" url="http://openvpn.sourceforge.net/" license="custom" @@ -10,17 +10,12 @@ depends="iproute2" makedepends="openssl-dev lzo-dev" install= source="http://$pkgname.net/release/$pkgname-$pkgver.tar.gz - openvpn-2.0.9-persistent.patch openvpn.initd " +_builddir="$srcdir"/$pkgname-$pkgver build() { - cd "$srcdir"/$pkgname-$pkgver - for i in ../*.patch; do - msg "Applying $i..." - patch -p1 < $i || return 1 - done - + cd "$_builddir" ./configure --prefix=/usr \ --mandir=/usr/share/man \ --enable-ssl \ @@ -29,10 +24,13 @@ build() { --enable-iproute2 make || return 1 - cd plugin/down-root make || return 1 cd ../.. +} + +package() { + cd "$_builddir" make DESTDIR="$pkgdir" install || return 1 @@ -54,8 +52,6 @@ build() { # install init.d install -Dm755 ../openvpn.initd "$pkgdir"/etc/init.d/openvpn - } -md5sums="60745008b90b7dbe25fe8337c550fec6 openvpn-2.0.9.tar.gz -a9075ceb8552980519132cc27fda85ac openvpn-2.0.9-persistent.patch -793184e36ad09b22cdb19b4294131508 openvpn.initd" +md5sums="b273ed2b5ec8616fb9834cde8634bce7 openvpn-2.1.1.tar.gz +020376f1e7ed6b4adbe20cf5ff774856 openvpn.initd" diff --git a/main/openvpn/openvpn-2.0.9-persistent.patch b/main/openvpn/openvpn-2.0.9-persistent.patch deleted file mode 100644 index e042124ea4..0000000000 --- a/main/openvpn/openvpn-2.0.9-persistent.patch +++ /dev/null @@ -1,44 +0,0 @@ -diff -ru openvpn-2.0.9~/init.c openvpn-2.0.9/init.c ---- openvpn-2.0.9~/init.c 2008-05-13 23:21:30.000000000 +0200 -+++ openvpn-2.0.9/init.c 2008-05-13 23:22:51.000000000 +0200 -@@ -347,7 +347,8 @@ - msg (M_FATAL|M_OPTERR, - "options --mktun or --rmtun should only be used together with --dev"); - tuncfg (options->dev, options->dev_type, options->dev_node, -- options->tun_ipv6, options->persist_mode); -+ options->tun_ipv6, options->persist_mode, -+ &options->tuntap_options); - return true; - } - #endif -diff -ru openvpn-2.0.9~/tun.c openvpn-2.0.9/tun.c ---- openvpn-2.0.9~/tun.c 2008-05-13 23:21:30.000000000 +0200 -+++ openvpn-2.0.9/tun.c 2008-05-13 23:22:51.000000000 +0200 -@@ -1095,13 +1095,14 @@ - #ifdef TUNSETPERSIST - - void --tuncfg (const char *dev, const char *dev_type, const char *dev_node, bool ipv6, int persist_mode) -+tuncfg (const char *dev, const char *dev_type, const char *dev_node, bool ipv6, int persist_mode, const struct tuntap_options *options) - { - struct tuntap *tt; - - ALLOC_OBJ (tt, struct tuntap); - clear_tuntap (tt); - tt->type = dev_type_enum (dev, dev_type); -+ tt->options = *options; - open_tun (dev, dev_type, dev_node, ipv6, tt); - if (ioctl (tt->fd, TUNSETPERSIST, persist_mode) < 0) - msg (M_ERR, "Cannot ioctl TUNSETPERSIST(%d) %s", persist_mode, dev); -diff -ru openvpn-2.0.9~/tun.h openvpn-2.0.9/tun.h ---- openvpn-2.0.9~/tun.h 2008-05-13 23:21:30.000000000 +0200 -+++ openvpn-2.0.9/tun.h 2008-05-13 23:22:51.000000000 +0200 -@@ -194,7 +194,7 @@ - int read_tun (struct tuntap* tt, uint8_t *buf, int len); - - void tuncfg (const char *dev, const char *dev_type, const char *dev_node, -- bool ipv6, int persist_mode); -+ bool ipv6, int persist_mode, const struct tuntap_options *options); - - const char *guess_tuntap_dev (const char *dev, - const char *dev_type, diff --git a/main/openvpn/openvpn.initd b/main/openvpn/openvpn.initd index 89201f9cf6..7e0e3eb9ef 100644 --- a/main/openvpn/openvpn.initd +++ b/main/openvpn/openvpn.initd @@ -13,9 +13,8 @@ VPNCONF="${VPNDIR}/${VPN}.conf" depend() { need localmount net - after firewall before netmount - after bootmisc + after bootmisc firewall } checktundevice() { diff --git a/main/parted/APKBUILD b/main/parted/APKBUILD index a606b75796..5e17213758 100644 --- a/main/parted/APKBUILD +++ b/main/parted/APKBUILD @@ -1,27 +1,27 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=parted -pkgver=1.8.8 -pkgrel=1 +pkgver=2.1 +pkgrel=0 pkgdesc="Utility to create, destroy, resize, check and copy partitions" url="http://www.gnu.org/software/parted/parted.html" license="GPL3" subpackages="$pkgname-dev $pkgname-doc" depends= -makedepends="pkgconfig e2fsprogs-dev readline-dev ncurses-dev" -source="ftp://ftp.gnu.org/pub/gnu/$pkgname/$pkgname-$pkgver.tar.gz - nocxx.patch" - -build () -{ - cd "$srcdir"/$pkgname-$pkgver - patch configure < ../nocxx.patch || return 1 +makedepends="pkgconfig e2fsprogs-dev readline-dev ncurses-dev lvm2-dev" +source="ftp://ftp.gnu.org/pub/gnu/$pkgname/$pkgname-$pkgver.tar.gz" +_builddir="$srcdir"/$pkgname-$pkgver +build() { + cd "$_builddir" ./configure --prefix=/usr \ --disable-debug \ --disable-nls \ --disable-Werror make || return 1 +} + +package() { + cd "$_builddir" make DESTDIR="$pkgdir" install } -md5sums="0d494591731082ec57cc18627728124a parted-1.8.8.tar.gz -28513788ba4d556ccd538867dc6205ab nocxx.patch" +md5sums="c0fd26f12fefb013d77cc5160722ec03 parted-2.1.tar.gz" diff --git a/main/perl-digest-hmac/APKBUILD b/main/perl-digest-hmac/APKBUILD index f9538dc049..70717b7320 100644 --- a/main/perl-digest-hmac/APKBUILD +++ b/main/perl-digest-hmac/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=perl-digest-hmac _realname=Digest-HMAC -pkgver=1.01 +pkgver=1.02 pkgrel=0 pkgdesc="Keyed-Hashing for Message Authentication Perl module" url="http://search.cpan.org/~gaas/Digest-HMAC-1.01/" @@ -12,14 +12,18 @@ install= subpackages="$pkgname-doc" source="http://search.cpan.org/CPAN/authors/id/G/GA/GAAS/$_realname-$pkgver.tar.gz" +_builddir="$srcdir"/$_realname-$pkgver build() { - cd "$srcdir/$_realname-$pkgver" - + cd "$_builddir" PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor || return 1 make || return 1 +} + +package() { + cd "$_builddir" make DESTDIR="$pkgdir" install # creates file collision among perl modules find "$pkgdir" -name perllocal.pod -delete } -md5sums="32dc54c765100c638b5d7f7ff4c5c626 Digest-HMAC-1.01.tar.gz" +md5sums="64c4b247d83cd64ec32aa22bf58a709b Digest-HMAC-1.02.tar.gz" diff --git a/main/perl-error/APKBUILD b/main/perl-error/APKBUILD index f0926e0bd7..9d04d4ee38 100644 --- a/main/perl-error/APKBUILD +++ b/main/perl-error/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Leonardo Arena <rnalrd@gmail.com> pkgname=perl-error _realname=Error -pkgver=0.17015 +pkgver=0.17016 pkgrel=0 pkgdesc="Perl module error/exception handling in an OO-ish way" url="http://search.cpan.org/~shlomif/Error-$pkgver/" @@ -13,14 +13,18 @@ install= subpackages="$pkgname-doc" source="http://search.cpan.org/CPAN/authors/id/S/SH/SHLOMIF/$_realname-$pkgver.tar.gz" +_builddir="$srcdir"/$_realname-$pkgver build() { - cd "$srcdir/$_realname-$pkgver" - + cd "$_builddir" PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor || return 1 make || return 1 +} + +package() { + cd "$_builddir" make DESTDIR="$pkgdir" install # creates file collision among perl modules find "$pkgdir" -name perllocal.pod -delete } -md5sums="203bc410ae5040e7b647a52aa0fabafe Error-0.17015.tar.gz" +md5sums="eedcd3c6970568dd32092b5334328eff Error-0.17016.tar.gz" diff --git a/main/perl-mail-spamassassin/APKBUILD b/main/perl-mail-spamassassin/APKBUILD index 6a3c884616..a86c014fde 100644 --- a/main/perl-mail-spamassassin/APKBUILD +++ b/main/perl-mail-spamassassin/APKBUILD @@ -3,7 +3,7 @@ pkgname=perl-mail-spamassassin _realname=Mail-SpamAssassin pkgver=3.2.5 -pkgrel=0 +pkgrel=1 pkgdesc="Spam detector and markup engine" url="http://search.cpan.org/~jmason/Mail-SpamAssassin-3.2.5/" license="unknown" @@ -12,14 +12,21 @@ perl-mail-spf razor" makedepends="perl-dev zlib-dev" install= subpackages="$pkgname-doc" -source="http://search.cpan.org/CPAN/authors/id/J/JM/JMASON/$_realname-$pkgver.tar.gz" +source="http://search.cpan.org/CPAN/authors/id/J/JM/JMASON/$_realname-$pkgver.tar.gz + spamassassin-3.2.5-DESTDIR.patch + " build() { cd "$srcdir/$_realname-$pkgver" - + patch -p1 -i ../spamassassin-3.2.5-DESTDIR.patch || return 1 PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor || return 1 - make || return 1 + make +} + +package() { + cd "$srcdir/$_realname-$pkgver" make DESTDIR="$pkgdir" install } -md5sums="7fdc1651d0371c4a7f95ac9ae6f828a6 Mail-SpamAssassin-3.2.5.tar.gz" +md5sums="7fdc1651d0371c4a7f95ac9ae6f828a6 Mail-SpamAssassin-3.2.5.tar.gz +45885134199c9427add4d9bcb46311cf spamassassin-3.2.5-DESTDIR.patch" diff --git a/main/perl-mail-spamassassin/spamassassin-3.2.5-DESTDIR.patch b/main/perl-mail-spamassassin/spamassassin-3.2.5-DESTDIR.patch new file mode 100644 index 0000000000..a9765fc55d --- /dev/null +++ b/main/perl-mail-spamassassin/spamassassin-3.2.5-DESTDIR.patch @@ -0,0 +1,273 @@ +--- Mail-SpamAssassin-3.2.5/Makefile.PL.old 2009-10-21 23:25:18.000000000 +0200 ++++ Mail-SpamAssassin-3.2.5/Makefile.PL 2009-10-21 23:31:28.000000000 +0200 +@@ -12,12 +12,12 @@ + + # avoid stupid 'Argument "6.30_01" isn't numeric in numeric ge (>=)' warnings; + # strip off the beta subversion noise that causes the trouble. + $mm_version =~ s/_\S+$//; # "6.30_01" => "6.30" + +-if ($mm_version+0 < 5.45) { +- die "SpamAssassin Makefile.PL requires at least ExtUtils::MakeMaker v5.45"; ++if ($mm_version < 6.17) { ++ die "SpamAssassin Makefile.PL requires at least ExtUtils::MakeMaker v6.17"; + } + + use constant RUNNING_ON_WINDOWS => ($^O =~ /^(mswin|dos|os2)/oi); + use constant HAS_DBI => eval { require DBI; }; + +@@ -82,11 +82,10 @@ + ); + + + sub parse_arg { + my($val, $name) = (@_); +- + if ($val =~ /^($name)=["']?(.*?)["']?$/) { + return $2; + } else { + return undef; + } +@@ -107,53 +106,27 @@ + return 'yes' if bool($val, $def); + return 'no'; + } + + +- + my %opt = ( +- 'build_spamc' => undef, ++ 'build_spamc' => undef, + 'enable_ssl' => undef, + 'contact_address' => undef, + 'destdir' => undef, + ); + ARGV: foreach (@ARGV) { + foreach my $key (keys %opt) { +- my $val; +- +- $val = parse_arg($_, uc($key)); ++ my $val = parse_arg($_, uc($key)); + if (defined $val) { + $opt{$key} = $val; + next ARGV; + } + } + } + + +-# Gather some information about what EU::MM offers and/or needs +-my( +- $mm_knows_destdir, +- $mm_has_destdir, +- $mm_has_good_destdir, +- $mm_needs_destdir, +-); +- +-# MakeMaker prior to 6.11 doesn't support DESTDIR which is needed for +-# packaging with builddir!=destdir. See bug 2388. +-$mm_knows_destdir = $ExtUtils::MakeMaker::Recognized_Att_Keys{DESTDIR}; +-$mm_has_good_destdir = $mm_version >= 6.11; +-# Add DESTDIR hack only if it's requested (and necessary) +-$mm_needs_destdir = $opt{'destdir'} && !$mm_has_good_destdir; +-$mm_has_destdir = $mm_knows_destdir || $mm_needs_destdir; +-push(@ATT_KEYS, 'DESTDIR') if $mm_needs_destdir; +- +-# Now make EU::MM understand our extended vars +-foreach my $key (@ATT_KEYS) { +- $ExtUtils::MakeMaker::Recognized_Att_Keys{$key} = 1; +-} +- +- + # Gather the rules files in the range 00-69; we do this in perl because + # it's more portable. Also, plugin .pm files. + my @datafiles = map { s,^rules/,,; $_ } + grep { -f $_ } (<rules/*.cf>, <rules/*.pm>); + my $datafiles = join(' ', (grep +@@ -270,75 +243,27 @@ + + # We have only this Makefile.PL and this option keeps MakeMaker from + # asking all questions twice after a 'make dist*'. + 'NORECURS' => 1, + +- # bug 5074: perl 5.6.1 (with ExtUtils::MakeMaker 5.45) attempts to +- # recurse anyway unless this is explicitly specified +- 'DIR' => [ ], +- + # Don't add META.yml to the MANIFEST for god's sake! + 'NO_META' => 1, + ); + + # rules/72_active.cf is built from "rulesrc", but *must* exist before + # WriteMakefile() is called due to shortcomings in MakeMaker. + my @FILES_THAT_MUST_EXIST = qw( + rules/72_active.cf + ); + +-# That META.yml stuff was introduced with Perl 6.06_03, see +-# <http://archive.develooper.com/makemaker@perl.org/msg00922.html> +-# <http://archive.develooper.com/makemaker@perl.org/msg00984.html> +-delete $makefile{'NO_META'} if $mm_version < 6.06_03; +- + # make sure certain optional modules are up-to-date if they are installed + # also see PREREQ_PM above + my %CURRENT_PM = ( + 'Net::DNS' => (RUNNING_ON_WINDOWS ? 0.46 : 0.34), + 'Razor2::Client::Agent' => 2.40, + ); + +-if ($mm_needs_destdir) { +- my $error = <<DESTDIR_HACK; +- +- *********************************************************************** +- ExtUtils::MakeMaker ${mm_version} doesn't include support for DESTDIR, +- so if you want to be on the safe side, you might want to upgrade your +- ExtUtils::MakeMaker to version 6.11 or later. It is available via CPAN. +- +- You can use either the CPAN shell or go to +- <http://search.cpan.org/search?module=ExtUtils::MakeMaker> +- to get an up-to-date version. +- +- This should only be necessary if you are creating binary packages. +- *********************************************************************** +- +-DESTDIR_HACK +- $error =~ s/^ {4}//gm; +- warn $error; +-} +-elsif ($opt{'destdir'} and !$mm_has_good_destdir) { +- my $error = <<DESTDIR_BUG; +- +- *********************************************************************** +- ExtUtils::MakeMaker ${mm_version} contains bugs that may cause problems +- in the \"make\" process. It is recommended that you upgrade +- ExtUtils::MakeMaker to version 6.11 or later. It is available via CPAN. +- +- You can use either the CPAN shell or go to +- <http://search.cpan.org/search?module=ExtUtils::MakeMaker> +- to get an up-to-date version. +- +- This should only be necessary if you are creating binary packages. +- *********************************************************************** +- +-DESTDIR_BUG +- $error =~ s/^ {4}//gm; +- warn $error; +-} +- + + # All the $(*MAN1*) stuff is empty/zero if Perl was Configured with -Dman1dir=none; + # however, support site/vendor man1 dirs (bug 5338) + unless($Config{installman1dir} + || $Config{installsiteman1dir} +@@ -405,22 +330,19 @@ + + # Now finish the meta hash and dump the Makefile + $makefile{EXE_FILES} = [ values %{$makefile{EXE_FILES}} ]; + $makefile{AUTHOR} =~ s/(<.+) at (.+>)/$1\@$2/; + WriteMakefile(%makefile); +-print "Makefile written by ExtUtils::MakeMaker ${mm_version}\n"; ++print "Makefile written by ExtUtils::MakeMaker $mm_version\n"; + + ####################################################################### + + package MY; + +- + use vars qw( + $MY_GLOBALS_ARE_SANE +- + $RUNNING_ON_WINDOWS +- + @REPOSITORIES + + $MACRO_RE + $EQ_RE + $EQ +@@ -906,19 +828,10 @@ + init_MY_globals($self); + + foreach (@code) { + # Add our install targets as a dependency to all top-level install targets + s/^(install(?:_[a-z]+)?\s*::?\s*.*)$/$1 conf__install data__install/; +- +- # Now do the DESTDIR hack, if necessary. +- next if !$mm_needs_destdir; +- # Write the correct path to perllocal.pod +- next if /installed into/; +- +- # Replace all other $(INSTALL*) vars (except $(INSTALLDIRS) of course) +- # with their $(DESTINSTALL*) counterparts +- s/\Q$(\E(INSTALL(?!DIRS)${MACRO_RE})\Q)\E/\$(DEST$1)/g; + } + + clean_MY_globals($self); + return join("\n", @code); + } +@@ -956,32 +869,10 @@ + set_macro($rprefix, macro_ref('PREFIX')); + $line .= "\n" . macro_def($rprefix); + } + } + } +- +- if (line_has_macro_def($line, 'MM_VERSION')) { +- # These macros are just for debugging purposes. +- $line = join("\n", $line, +- macro_def(MM_HAS_DESTDIR => ::yesno($mm_has_destdir)), +- macro_def(MM_HAS_GOOD_DESTDIR => ::yesno($mm_has_good_destdir)), +- macro_def(MM_KNOWS_DESTDIR => ::yesno($mm_knows_destdir)), +- macro_def(MM_NEEDS_DESTDIR => ::yesno($mm_needs_destdir)), +- ); +- } +- +- # Add DESTDIR support if necessary +- if ($mm_needs_destdir) { +- if (line_has_macro_def($line, 'INSTALLDIRS')) { +- $line .= "\n" . macro_def('DESTDIR'); +- } +- elsif (line_has_macro_def($line, qr/INSTALL${MACRO_RE}/)) { +- my $macro = get_macro_name_from_line($line); +- $line .= "\n" . macro_def('DEST' . $macro, +- macro_ref('DESTDIR') . macro_ref($macro)); +- } +- } + } + push(@code, qq{}); + + # Add some additional target dirs + { +@@ -1015,13 +906,11 @@ + foreach my $r (@REPOSITORIES) { + my $macro = 'INSTALL' . repository($r) . $m; + # The INSTALL* macros. + push(@code, macro_def($macro)); + # The DESTINSTALL* macros. +- push(@code, macro_def('DEST' . $macro, +- macro_ref('DESTDIR') . macro_ref($macro))) +- if $mm_has_destdir; ++ push(@code, macro_def('DEST' . $macro, macro_ref('DESTDIR') . macro_ref($macro))); + } + } + } + + # Set the PERL_* stuff +@@ -1068,17 +957,12 @@ + # SCRIPT macro is the same for all repositories. + foreach my $macro (qw(SCRIPT DATA CONF LIB)) { + push(@code, macro_def('I_' . $macro . 'DIR', + macro_ref('INSTALL' . repository($repository, $macro eq 'SCRIPT') . $macro))); + +- if ($mm_has_destdir) { +- push(@code, macro_def('B_' . $macro . 'DIR', +- macro_ref('DESTINSTALL' . repository($repository, $macro eq 'SCRIPT') . $macro))); +- } else { +- push(@code, macro_def('B_' . $macro . 'DIR', +- macro_ref('I_' . $macro . 'DIR'))); +- } ++ push(@code, macro_def('B_' . $macro . 'DIR', ++ macro_ref('DESTINSTALL' . repository($repository, $macro eq 'SCRIPT') . $macro))); + } + } + + clean_MY_globals($self); + return join("\n", @code); diff --git a/main/perl-mail-spf/APKBUILD b/main/perl-mail-spf/APKBUILD index 83842478eb..eec71b18b3 100644 --- a/main/perl-mail-spf/APKBUILD +++ b/main/perl-mail-spf/APKBUILD @@ -2,8 +2,8 @@ # Maintainer: Leonardo Arena <rnalrd@gmail.com> pkgname=perl-mail-spf _realname=Mail-SPF -pkgver=2.006 -pkgrel=1 +pkgver=2.007 +pkgrel=0 pkgdesc="An object-oriented implementation of Sender Policy Framework" url="http://search.cpan.org/~jmehnle/Mail-SPF-v2.006/" license="GPL PerlArtistic" @@ -13,12 +13,16 @@ install= subpackages="$pkgname-doc" source="http://search.cpan.org/CPAN/authors/id/J/JM/JMEHNLE/mail-spf/$_realname-v$pkgver.tar.gz" +_builddir="$srcdir/$_realname-v$pkgver" build() { - cd "$srcdir/$_realname-v$pkgver" - + cd "$_builddir" PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor || return 1 make || return 1 +} + +package() { + cd "$_builddir" make DESTDIR="$pkgdir" install } -md5sums="4da41591b612560627ddbc6026b047a3 Mail-SPF-v2.006.tar.gz" +md5sums="67dccdc91e3264679a0e17d493d3cc30 Mail-SPF-v2.007.tar.gz" diff --git a/main/perl-net-dns/APKBUILD b/main/perl-net-dns/APKBUILD index a9eef71bf4..d87821b69b 100644 --- a/main/perl-net-dns/APKBUILD +++ b/main/perl-net-dns/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Leonardo Arena <rnalrd@gmail.com> pkgname=perl-net-dns _realname=Net-DNS -pkgver=0.65 +pkgver=0.66 pkgrel=0 pkgdesc="Perl interface to the DNS resolver" url="http://search.cpan.org/dist/Archive-Zip/" @@ -13,14 +13,18 @@ install= subpackages="$pkgname-doc" source="http://search.cpan.org/CPAN/authors/id/O/OL/OLAF/$_realname-$pkgver.tar.gz" +_builddir="$srcdir/$_realname-$pkgver" build() { - cd "$srcdir/$_realname-$pkgver" - + cd "$_builddir" PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor || return 1 make || return 1 +} + +package() { + cd "$_builddir" make DESTDIR="$pkgdir" install # creates file collision among perl modules find "$pkgdir" -name perllocal.pod -delete } -md5sums="54e5a12a20de39b954a93723927ac789 Net-DNS-0.65.tar.gz" +md5sums="1635d876324e3c2f6e277d5778bfe94c Net-DNS-0.66.tar.gz" diff --git a/main/perl-net-rblclient/APKBUILD b/main/perl-net-rblclient/APKBUILD new file mode 100644 index 0000000000..e68eaae298 --- /dev/null +++ b/main/perl-net-rblclient/APKBUILD @@ -0,0 +1,26 @@ +# Contributor: Michael Mason <ms13sp@gmail.com> +# Maintainer: Michael Mason <ms13sp@gmail.com> +pkgname=perl-net-rblclient +_realname=Net-RBLClient +pkgver=0.5 +pkgrel=0 +pkgdesc="Queries multiple Realtime Blackhole Lists in parallel" +url="http://search.cpan.org/dist/Net-RBLClient/" +license="unknown" +depends="perl" +makedepends="perl-dev" +install= +subpackages="$pkgname-doc" +source="http://search.cpan.org/CPAN/authors/id/A/AB/ABLUM/$_realname-$pkgver.tar.gz" + +build() { + cd "$srcdir/RBLCLient-$pkgver" + + PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor || return 1 + make || return 1 + make DESTDIR="$pkgdir" install + # creates file collision among perl modules + find "$pkgdir" -name perllocal.pod -delete +} + +md5sums="1fb9961106cbb5a6eb2257762847e502 Net-RBLClient-0.5.tar.gz" diff --git a/main/perl-parse-syslog/APKBUILD b/main/perl-parse-syslog/APKBUILD new file mode 100644 index 0000000000..af6da0feda --- /dev/null +++ b/main/perl-parse-syslog/APKBUILD @@ -0,0 +1,26 @@ +# Contributor: Michael Mason <ms13sp@gmail.com> +# Maintainer: Michael Mason <ms13sp@gmail.com> +pkgname=perl-parse-syslog +_realname=Parse-Syslog +pkgver=1.10 +pkgrel=0 +pkgdesc="Parse Unix syslog files" +url="http://search.cpan.org/~dschwei/Parse-Syslog-1.10/" +license="unknown" +depends="perl" +makedepends="perl-dev" +install= +subpackages="$pkgname-doc" +source="http://search.cpan.org/CPAN/authors/id/D/DS/DSCHWEI/$_realname-$pkgver.tar.gz" + +build() { + cd "$srcdir/$_realname-$pkgver" + + PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor || return 1 + make || return 1 + make DESTDIR="$pkgdir" install + # creates file collision among perl modules + find "$pkgdir" -name perllocal.pod -delete +} + +md5sums="e1c4c03aaa7cb8d2baa52f294dd9accc Parse-Syslog-1.10.tar.gz" diff --git a/main/postgrey/APKBUILD b/main/postgrey/APKBUILD index b7ce04f1c3..83afce3c6f 100644 --- a/main/postgrey/APKBUILD +++ b/main/postgrey/APKBUILD @@ -1,30 +1,36 @@ -# Maintainer: Leonardo Arena <rnalrg@gmail.com> +# Contributor: Michael Mason <ms13sp@gmail.com> +# Maintainer: Michael Mason <ms13sp@gmail.com> pkgname=postgrey pkgver=1.32 -pkgrel=0 -pkgdesc="Postfix Greylisting Policy Server" +pkgrel=2 +pkgdesc="Postfix policy server implementing greylisting" url="http://postgrey.schweikert.ch/" -license="GPL-2" -depends="perl-net-server perl-io-multiplex perl-db postfix" +license="GPL" +depends="perl perl-db perl-net-dns perl-net-server perl-io-multiplex + perl-net-rblclient perl-parse-syslog" +pkgusers="postgrey" +pkggroups="postgrey" makedepends="" -install="$pkgname.pre-install" -subpackages="$pkgname-doc" -source="http://postgrey.schweikert.ch/pub/$pkgname-$pkgver.tar.gz" +install=postgrey.pre-install +subpackages="" +source="http://postgrey.schweikert.ch/pub/$pkgname-$pkgver.tar.gz + postgrey.confd + postgrey.initd" build() { cd "$srcdir"/$pkgname-$pkgver - mkdir -p -m0770 $pkgdir/var/spool/postfix/postgrey - chown postgrey.postgrey $pkgdir/var/spool/postfix/postgrey - install -m755 -D postgrey $pkgdir/usr/sbin/postgrey - install -m755 -D policy-test $pkgdir/usr/bin/policy-test - install -m755 -D contrib/postgreyreport $pkgdir/usr/bin/postgreyreport - install -m644 -D postgrey_whitelist_recipients $pkgdir/etc/postfix/postgrey_whitelist_recipients - install -m644 -D postgrey_whitelist_clients $pkgdir/etc/postfix/postgrey_whitelist_clients - install -m644 -D README $pkgdir/usr/share/doc/$pkgname/README - install -m644 -D Changes $pkgdir/usr/share/doc/$pkgname/Changes - install -m644 -D COPYING $pkgdir/usr/share/doc/$pkgname/COPYING - install -m755 -D ../../postgrey.init $pkgdir/etc/init.d/postgrey - install -m644 -D ../../postgrey.conf $pkgdir/etc/conf.d/postgrey + + install -m755 -D $pkgname "$pkgdir"/usr/sbin/$pkgname + mkdir -p "$pkgdir"/var/spool/postfix/$pkgname + chown postgrey:postgrey "$pkgdir"/var/spool/postfix/$pkgname + chmod 770 "$pkgdir"/var/spool/postfix/$pkgname + install -m755 -D contrib/postgreyreport "$pkgdir"/usr/bin/postgreyreport + install -m755 -D "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname + install -m644 -D postgrey_whitelist_clients "$pkgdir"/etc/postfix/postgrey_whitelist_clients + install -m644 -D postgrey_whitelist_recipients "$pkgdir"/etc/postfix/postgrey_whitelist_recipients + install -m644 -D "$srcdir"/$pkgname.confd "$pkgdir"/etc/conf.d/$pkgname } -md5sums="524a4e165bf997996f3bccade394712f postgrey-1.32.tar.gz" +md5sums="524a4e165bf997996f3bccade394712f postgrey-1.32.tar.gz +caaad5770ab07fb5af3bbd522a05b84f postgrey.confd +d0611b244202c77ad7ad79862721a738 postgrey.initd" diff --git a/main/postgrey/postgrey.conf b/main/postgrey/postgrey.confd index 0baa871a8b..7a6deb587f 100644 --- a/main/postgrey/postgrey.conf +++ b/main/postgrey/postgrey.confd @@ -29,7 +29,7 @@ POSTGREY_PID="/var/run/postgrey.pid" # DELAY # How long to delay mail that is greylisted in seconds. -POSTGREY_DELAY=60 +POSTGREY_DELAY=300 # TEXT # The response we'll send back with delayed mail. diff --git a/main/postgrey/postgrey.init b/main/postgrey/postgrey.initd index d38538de17..c9e51ceba9 100644 --- a/main/postgrey/postgrey.init +++ b/main/postgrey/postgrey.initd @@ -9,6 +9,7 @@ opts="${opts} reload" depend() { need net + after firewall before postfix provide postfix_greylist } diff --git a/main/postgrey/postgrey.pre-install b/main/postgrey/postgrey.pre-install index e37a27f7d5..3c34c3fd5f 100755..100644 --- a/main/postgrey/postgrey.pre-install +++ b/main/postgrey/postgrey.pre-install @@ -1,2 +1,6 @@ #!/bin/sh -adduser -h /var/spool/postfix/postgrey -g postgrey -s /bin/false -D postgrey &>/dev/null + +addgroup postgrey 2>/dev/null +adduser -H -h /dev/null -s /bin/false -D postgrey 2>/dev/null + +exit 0 diff --git a/main/wireshark/APKBUILD b/main/wireshark/APKBUILD index 33126d3f34..8cd7aa0f6f 100644 --- a/main/wireshark/APKBUILD +++ b/main/wireshark/APKBUILD @@ -1,19 +1,20 @@ # Contributor: Jeremy Thomerson <jeremy@thomersonfamily.com> # Maintainer: Jeremy Thomerson <jeremy@thomersonfamily.com> pkgname=wireshark -pkgver=1.2.4 +pkgver=1.2.6 pkgrel=0 -pkgdesc="A free network protocol analyzer for Unix/Linux and Windows formerly known as Ethereal" +pkgdesc="network protocol analyzer - GTK version" url="http://www.wireshark.org" license="GPLv2" -depends="gnutls bash heimdal" -makedepends="bison flex perl glib glib-dev pkgconfig libpcap-dev libcap-dev" +depends="bash" +makedepends="bison flex perl glib glib-dev pkgconfig libpcap-dev libcap-dev + gtk+-dev c-ares-dev pcre-dev openssl-dev" install="" -subpackages="$pkgname-dev $pkgname-doc" -source="http://www.wireshark.org/download/src/${pkgname}-${pkgver}.tar.bz2" +subpackages="$pkgname-dev $pkgname-doc $pkgname-common tshark" +source="http://www.wireshark.org/download/src/${pkgname}-${pkgver}.tar.bz2 + wireshark.desktop + wireshark.png" -# append extra dependencies to -dev subpackage -# remove if not used. # depends_dev="somepackage-dev" build() { @@ -23,9 +24,7 @@ build() { --sysconfdir=/etc \ --mandir=/usr/share/man \ --infodir=/usr/share/info \ - --disable-wireshark \ - --disable-editcap \ - --disable-mergecap \ + --with-ssl \ --disable-text2pcap \ --disable-idl2wrs \ --disable-dftest \ @@ -35,7 +34,36 @@ build() { package() { cd "$srcdir"/$pkgname-$pkgver - make DESTDIR="$pkgdir" install + make -j1 DESTDIR="$pkgdir" install + install -Dm644 "$srcdir"/wireshark.png \ + "$pkgdir"/usr/share/icons/wireshark.png + install -Dm644 "$srcdir"/wireshark.desktop \ + "$pkgdir"/usr/share/applications/wireshark.desktop } -md5sums="ae4533da7d0e54c236e1eed966c42163 wireshark-1.2.4.tar.bz2" +common() { + local i + pkgdesc="network protoccol analyzer - common files" + mkdir -p "$subpkgdir"/usr/lib "$subpkgdir"/usr/share \ + "$subpkgdir"/usr/bin + mv "$pkgdir"/etc "$subpkgdir"/ + mv "$pkgdir"/usr/share/wireshark "$subpkgdir"/usr/share/ + mv "$pkgdir"/usr/lib/* "$subpkgdir"/usr/lib/ + # move all bins except wireshark + for i in "$pkgdir"/usr/bin/*; do + case "$i" in + */tshark|*/wireshark) continue;; + esac + mv "$i" "$subpkgdir"/usr/bin/ + done +} + +tshark() { + pkgdesc="network protoccol analyzer - console version" + install -d "$subpkgdir"/usr/bin + mv "$pkgdir"/usr/bin/tshark "$subpkgdir"/usr/bin/tshark +} + +md5sums="f3e0917ed393366bbf96c53b58cb0931 wireshark-1.2.6.tar.bz2 +504ede44c02b2a52f6cbd3bffdf93b8d wireshark.desktop +e771800a8c977fe223583a453bc27397 wireshark.png" diff --git a/main/wireshark/wireshark.desktop b/main/wireshark/wireshark.desktop new file mode 100644 index 0000000000..f4317f6d04 --- /dev/null +++ b/main/wireshark/wireshark.desktop @@ -0,0 +1,10 @@ +[Desktop Entry] +Encoding=UTF-8 +GenericName=Wireshark +Comment=Network protocol analyzer +Name=wireshark +Exec=wireshark +Icon=/usr/share/icons/wireshark.png +Type=Application +Terminal=false +Categories=Application;Network; diff --git a/main/wireshark/wireshark.png b/main/wireshark/wireshark.png Binary files differnew file mode 100644 index 0000000000..4e40263042 --- /dev/null +++ b/main/wireshark/wireshark.png diff --git a/main/wpa_supplicant/APKBUILD b/main/wpa_supplicant/APKBUILD new file mode 100644 index 0000000000..f904415891 --- /dev/null +++ b/main/wpa_supplicant/APKBUILD @@ -0,0 +1,113 @@ +# Maintainer: Natanael Copa <ncopa@alpinelinux.org> +pkgname=wpa_supplicant +pkgver=0.6.9 +pkgrel=1 +pkgdesc="A utility providing key negotiation for WPA wireless networks" +url="http://hostap.epitest.fi/wpa_supplicant" +license="GPL" +subpackages="$pkgname-doc" +depends= +makedepends="openssl-dev dbus-dev libnl-dev" +source="http://hostap.epitest.fi/releases/$pkgname-$pkgver.tar.gz + " + +_builddir="$srcdir"/$pkgname-$pkgver/$pkgname +prepare() { + cd "$_builddir" + # Toolchain setup + echo "CC = $CC" > .config + + # Basic setup + echo "CONFIG_CTRL_IFACE=y" >> .config + echo "CONFIG_BACKEND=file" >> .config + + # Basic authentication methods + # NOTE: we don't set GPSK or SAKE as they conflict + # with the below options + echo "CONFIG_EAP_GTC=y" >> .config + echo "CONFIG_EAP_MD5=y" >> .config + echo "CONFIG_EAP_OTP=y" >> .config + echo "CONFIG_EAP_PAX=y" >> .config + echo "CONFIG_EAP_PSK=y" >> .config + echo "CONFIG_EAP_TLV=y" >> .config + echo "CONFIG_IEEE8021X_EAPOL=y" >> .config + echo "CONFIG_PKCS12=y" >> .config + echo "CONFIG_PEERKEY=y" >> .config + echo "CONFIG_EAP_LEAP=y" >> .config + echo "CONFIG_EAP_MSCHAPV2=y" >> .config + echo "CONFIG_EAP_PEAP=y" >> .config + echo "CONFIG_EAP_TLS=y" >> .config + echo "CONFIG_EAP_TTLS=y" >> .config + + # dbus support + echo "CONFIG_CTRL_IFACE_DBUS=y" >> .config + + # debug + # echo "CONFIG_DEBUG_FILE=y" >> .config + + # Smart card authentication + #echo "CONFIG_EAP_SIM=y" >> .config + #echo "CONFIG_EAP_AKA=y" >> .config + #echo "CONFIG_EAP_AKA_PRIME=y" >> .config + #echo "CONFIG_PCSC=y" >> .config + + # readline/history support for wpa_cli + #echo "CONFIG_READLINE=y" >> .config + + # SSL authentication methods + echo "CONFIG_TLS=openssl" >> .config + echo "CONFIG_SMARTCARD=y" >> .config + # use gnutls + # echo "CONFIG_TLS=gnutls" >> .config + # echo "CONFIG_GNUTLS_EXTRA=y" >> .config + #echo "CONFIG_TLS=internal" >> .config + + # Linux specific drivers + echo "CONFIG_DRIVER_ATMEL=y" >> .config + #echo "CONFIG_DRIVER_BROADCOM=y" >> .config + #echo "CONFIG_DRIVER_HERMES=y" >> .config + echo "CONFIG_DRIVER_HOSTAP=y" >> .config + echo "CONFIG_DRIVER_IPW=y" >> .config + echo "CONFIG_DRIVER_NDISWRAPPER=y" >> .config + echo "CONFIG_DRIVER_NL80211=y" >> .config + #echo "CONFIG_DRIVER_PRISM54=y" >> .config + echo "CONFIG_DRIVER_RALINK=y" >> .config + echo "CONFIG_DRIVER_WEXT=y" >> .config + echo "CONFIG_DRIVER_WIRED=y" >> .config + + # Add include path for madwifi-driver headers + #echo "CFLAGS += -I/usr/include/madwifi" >> .config + #echo "CONFIG_DRIVER_MADWIFI=y" >> .config + + # Wi-Fi Protected Setup (WPS) + echo "CONFIG_WPS=y" >> .config + + # Enable mitigation against certain attacks against TKIP + echo "CONFIG_DELAYED_MIC_ERROR_REPORT=y" >> .config +} + +build() { + cd "$_builddir" + make || return 1 +} + +package() { + cd "$_builddir" + make PREFIX=/usr DESTDIR="$pkgdir" install || return 1 + install -Dm644 wpa_supplicant.conf "$pkgdir"/etc/wpa_supplicant.conf + install -Dm644 doc/docbook/wpa_supplicant.conf.5 \ + "$pkgdir"/usr/share/man/man5/wpa_supplicant.conf.5 || return 1 + + for i in wpa_background wpa_cli wpa_passphrase wpa_supplicant; do + install -Dm644 doc/docbook/$i.8 \ + "$pkgdir"/usr/share/man/man8/$i.8 || return 1 + done + install -m755 -d "$pkgdir"/usr/share/dbus-1/system-services + sed -e 's/sbin/usr\/sbin/' -i dbus-wpa_supplicant.service + install -m644 dbus-wpa_supplicant.service \ + "$pkgdir"/usr/share/dbus-1/system-services/fi.epitest.hostap.WPASupplicant.service || return 1 + install -m755 -d "$pkgdir"/etc/dbus-1/system.d + install -m644 dbus-wpa_supplicant.conf \ + "$pkgdir"/etc/dbus-1/system.d/fi.epitest.hostap.WPASupplicant.conf || return 1 +} +md5sums="0efb8fcedf0a8acf6f423dfdb0658fdd wpa_supplicant-0.6.9.tar.gz" diff --git a/main/wv/APKBUILD b/main/wv/APKBUILD index c66ff3b11f..b3b48ff42c 100644 --- a/main/wv/APKBUILD +++ b/main/wv/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=wv pkgver=1.2.4 -pkgrel=0 +pkgrel=1 pkgdesc="MSWord library can load and parse Word 2000, 97, 95 and 6 file formats" url="http://sourceforge.net/projects/wvware" license="GPL" diff --git a/main/xfsprogs/APKBUILD b/main/xfsprogs/APKBUILD index 83d31e03fd..638c4b72f0 100644 --- a/main/xfsprogs/APKBUILD +++ b/main/xfsprogs/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=xfsprogs -pkgver=3.1.0 +pkgver=3.1.1 pkgrel=0 pkgdesc="XFS filesystem utilities" url="http://oss.sgi.com/projects/xfs/" @@ -9,17 +9,13 @@ depends="e2fsprogs" makedepends="e2fsprogs-dev bash" subpackages="$pkgname-dev $pkgname-doc" source="ftp://oss.sgi.com/projects/xfs/cmd_tars/${pkgname}-$pkgver.tar.gz - xfsprogs-3.0.0-gzip.patch " _builddir="$srcdir"/$pkgname-$pkgver prepare() { cd "$_builddir" - for i in ../*.patch; do - msg "Applying $i..." - patch -p1 < $i || return 1 - done + sed -i -e 's/--best//' Makefile doc/Makefile } build() { @@ -40,5 +36,4 @@ package() { cd "$_builddir" make -j1 DIST_ROOT="$pkgdir" install install-dev } -md5sums="07c1ff6a4a44b58ee5ffdabca33a4493 xfsprogs-3.1.0.tar.gz -c72865de30f55343e843dd4fd49a91c5 xfsprogs-3.0.0-gzip.patch" +md5sums="c2308b46ee707597ac50aae418d321b8 xfsprogs-3.1.1.tar.gz" diff --git a/main/xfsprogs/xfsprogs-3.0.0-gzip.patch b/main/xfsprogs/xfsprogs-3.0.0-gzip.patch deleted file mode 100644 index 40f80023d4..0000000000 --- a/main/xfsprogs/xfsprogs-3.0.0-gzip.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -ru xfsprogs-3.0.0.orig/doc/Makefile xfsprogs-3.0.0/doc/Makefile ---- xfsprogs-3.0.0.orig/doc/Makefile 2009-02-18 13:42:47.000000000 +0000 -+++ xfsprogs-3.0.0/doc/Makefile 2009-02-18 13:43:10.000000000 +0000 -@@ -13,7 +13,7 @@ - include $(BUILDRULES) - - CHANGES.gz: -- $(ZIP) --best -c < CHANGES > $@ -+ $(ZIP) -c < CHANGES > $@ - - install: default - $(INSTALL) -m 755 -d $(PKG_DOC_DIR) -diff -ru xfsprogs-3.0.0.orig/include/buildmacros xfsprogs-3.0.0/include/buildmacros ---- xfsprogs-3.0.0.orig/include/buildmacros 2009-02-18 13:42:47.000000000 +0000 -+++ xfsprogs-3.0.0/include/buildmacros 2009-02-18 13:43:46.000000000 +0000 -@@ -128,7 +128,7 @@ - MAN_MAKERULE = \ - @for f in *.[12345678] ""; do \ - if test ! -z "$$f"; then \ -- $(ZIP) --best -c < $$f > $$f.gz; \ -+ $(ZIP) -c < $$f > $$f.gz; \ - fi; \ - done - diff --git a/main/xorg-server/APKBUILD b/main/xorg-server/APKBUILD index 4b9796e36b..062e456d1e 100644 --- a/main/xorg-server/APKBUILD +++ b/main/xorg-server/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=xorg-server -pkgver=1.7.3.902 +pkgver=1.7.4.901 pkgrel=0 pkgdesc="X.Org X servers" url="http://xorg.freedesktop.org" @@ -133,5 +133,5 @@ xephyr() { mv "$pkgdir"/usr/bin/Xephyr "$subpkgdir"/usr/bin/ } -md5sums="5806bd9d1ed734a60db2e32473a720b4 xorg-server-1.7.3.902.tar.bz2 +md5sums="e1656bd2fd362299dc7bae489525a9da xorg-server-1.7.4.901.tar.bz2 222de594206d1148a90eddfda4f7a11a xorg-redhat-die-ugly-pattern-die-die-die.patch" diff --git a/main/zlib/APKBUILD b/main/zlib/APKBUILD index b9d1f799bf..11f1f87e94 100644 --- a/main/zlib/APKBUILD +++ b/main/zlib/APKBUILD @@ -1,25 +1,31 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=zlib -pkgver=1.2.3.4 +pkgver=1.2.3.7 pkgrel=1 pkgdesc="A compression/decompression Library" license=custom:zlib url="http://www.gzip.org/zlib" depends= -source="ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.gz" +source="ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.gz + gzflush.patch" subpackages="$pkgname-dev $pkgname-doc" +_builddir="$srcdir/$pkgname-$pkgver" +prepare() { + cd "$_builddir" + patch -p1 -i "$srcdir"/gzflush.patch +} + build() { - cd "$srcdir/$pkgname-$pkgver" + cd "$_builddir" ./configure --prefix=/usr --libdir=/lib --shared make || return 1 } package() { - cd "$srcdir/$pkgname-$pkgver" + cd "$_builddir" make install \ pkgconfigdir="/usr/lib/pkgconfig" \ - LIBS="libz.so.1.2.3.4 libz.a" \ DESTDIR="$pkgdir" || return 1 } @@ -29,4 +35,5 @@ dev() { mv "$pkgdir"/lib/libz.a "$subpkgdir"/lib/libz.a } -md5sums="70cad33163abe3c234939a5c63bf95ea zlib-1.2.3.4.tar.gz" +md5sums="323e45f54f321116a34950e8fbf5b6e7 zlib-1.2.3.7.tar.gz +36746b916479fcf14b7a4393bee2f2d6 gzflush.patch" diff --git a/main/zlib/gzflush.patch b/main/zlib/gzflush.patch new file mode 100644 index 0000000000..5e97e6573c --- /dev/null +++ b/main/zlib/gzflush.patch @@ -0,0 +1,12 @@ +--- a/gzwrite.c 2010-01-18 21:18:27.000000000 +0100 ++++ b/gzwrite.c 2010-01-28 04:37:20.330530306 +0100 +@@ -435,7 +435,8 @@ + state = (gz_statep)file; + + /* check that we're writing and that there's no error */ +- if (state->mode != GZ_WRITE|| state->err != Z_OK) ++ if (state->mode != GZ_WRITE || state->err != Z_OK) ++ return Z_STREAM_ERROR; + + /* check flush parameter */ + if (flush < 0 || flush > Z_FINISH) |
