main/snort: fix source= url

1 files changed, 13 insertions, 17 deletions

diff --git a/main/snort/APKBUILD b/main/snort/APKBUILD
index e95a5e87e1..922192ab3f 100644
--- a/main/snort/APKBUILD
+++ b/main/snort/APKBUILD
@@ -14,28 +14,26 @@ makedepends="pcre-dev libpcap-dev libnet-dev libdnet-dev daq-dev daq-static
 	libnfnetlink-dev libnetfilter_queue-dev"
 install="$pkgname.pre-install"
 subpackages="$pkgname-doc $pkgname-dev $pkgname-openrc"
-source="https://www.snort.org/downloads/snort/snort-$pkgver.tar.gz
-        snort.initd
-        snort.confd
+source="https://www.snort.org/downloads/archive/snort/snort-$pkgver.tar.gz
+	snort.initd
+	snort.confd
 	"
 pkgusers="snort"
 pkggroups="snort"
 
 prepare() {
 	default_prepare
-	cd "$builddir"
 	# fix parallel builds
 #	sed -i -e 's/^all-local:.*/all-local: $(LTLIBRARIES)/' \
-#		src/dynamic-preprocessors/*/Makefile.am || return 1
+#		src/dynamic-preprocessors/*/Makefile.am
 	# correct paths in default config file
 	sed -i -e 's|/usr/local|/usr|' etc/snort.conf
 	sed -i -e 's|\.\./|/var/lib/snort/|' etc/snort.conf
 }
 
 build() {
-        cd "$builddir"
-	export CFLAGS="$CFLAGS `pkgconf --cflags libtirpc`"
-	export LDFLAGS="$LDFLAGS `pkgconf --libs libtirpc`"
+	export CFLAGS="$CFLAGS $(pkgconf --cflags libtirpc)"
+	export LDFLAGS="$LDFLAGS $(pkgconf --libs libtirpc)"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -47,23 +45,21 @@ build() {
 		--enable-gre \
 		--enable-non-ether-decoders \
 		--disable-open-appid
-        make
+	make
 }
 
 check() {
-	cd "$builddir"
 	./src/snort --version > /dev/null
 }
 
 package() {
-        cd "$builddir"
-        make -j1 DESTDIR="$pkgdir" install
+	make -j1 DESTDIR="$pkgdir" install
 
-        install -D -m 755 ../snort.initd "$pkgdir"/etc/init.d/snort
-        install -D -m 644 ../snort.confd "$pkgdir"/etc/conf.d/snort
-        install -D -m 644 etc/snort.conf "$pkgdir"/etc/snort/snort.conf
-        install -D -m 644 etc/gen-msg.map "$pkgdir"/etc/snort/gen-msg.map
-        install -D -m 644 rpm/snort.logrotate "$pkgdir"/etc/logrotate.d/snort
+	install -D -m 755 ../snort.initd "$pkgdir"/etc/init.d/snort
+	install -D -m 644 ../snort.confd "$pkgdir"/etc/conf.d/snort
+	install -D -m 644 etc/snort.conf "$pkgdir"/etc/snort/snort.conf
+	install -D -m 644 etc/gen-msg.map "$pkgdir"/etc/snort/gen-msg.map
+	install -D -m 644 rpm/snort.logrotate "$pkgdir"/etc/logrotate.d/snort
 	mkdir -p "$pkgdir"/usr/lib/snort_dynamicrules
 	mkdir -p "$pkgdir"/var/lib/snort/rules
 	mkdir -m 770 -p "$pkgdir"/var/log/snort && chown snort.snort "$pkgdir"/var/log/snort