Date: Tuesday, August 11, 2015 @ 15:11:50 Author: spupykin Revision: 138234
upgpkg: udpxy 1.0.23.9-1 upd Modified: udpxy/trunk/PKGBUILD udpxy/trunk/udpxy.service Deleted: udpxy/trunk/pidfile.patch ---------------+ PKGBUILD | 26 +++++++++----------------- pidfile.patch | 48 ------------------------------------------------ udpxy.service | 1 - 3 files changed, 9 insertions(+), 66 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2015-08-11 12:59:11 UTC (rev 138233) +++ PKGBUILD 2015-08-11 13:11:50 UTC (rev 138234) @@ -5,33 +5,25 @@ # Maintainer: Jose Riha <jose 1711 gmail com> pkgname=udpxy -pkgver=1.0.23.0 -_pkgver=1.0.23-0 -pkgrel=3 +pkgver=1.0.23.9 +_pkgver=1.0.23-9 +pkgrel=1 pkgdesc="small-footprint UNIX/Linux daemon to relay multicast UDP traffic to client's TCP (HTTP) connection." arch=(i686 x86_64) url="http://udpxy.sf.net" license=('GPL3') -source=(http://sourceforge.net/projects/$pkgname/files/$pkgname/Chipmunk-1.0/$pkgname.${_pkgver}-prod.tar.gz - $pkgname.service - pidfile.patch) -md5sums=('3dd99ba264078e873cbe1d98369ed423' - 'f47aeec41aa03acd4b61a6bfa03b0dff' - '7a268f58ee964895377c95d16c9c633a') +source=(http://www.udpxy.com/download/1_23/udpxy.${_pkgver}-prod.tar.gz + $pkgname.service) +md5sums=('0c953f7dd80329c1a062997afb9b6744' + 'e18b0a7f285789e1f2fe80238deb434d') -prepare() { - cd "$srcdir/$pkgname-${_pkgver}" - patch -Np1 -i "${srcdir}/pidfile.patch" - sed -i '/ln -s $(INSTALLROOT)\/bin\/$(EXEC) $(INSTALLROOT)\/bin\/$(UDPXREC/s%$(INSTALLROOT)%/usr%' Makefile -} - build() { cd "$srcdir/$pkgname-${_pkgver}" - make + make PREFIX=/usr CC="gcc -O2" } package() { cd "$srcdir/$pkgname-${_pkgver}" - make INSTALLROOT="$pkgdir/usr" install + make DESTDIR="$pkgdir" PREFIX=/usr install install -D -m644 $srcdir/$pkgname.service $pkgdir/usr/lib/systemd/system/$pkgname.service } Deleted: pidfile.patch =================================================================== --- pidfile.patch 2015-08-11 12:59:11 UTC (rev 138233) +++ pidfile.patch 2015-08-11 13:11:50 UTC (rev 138234) @@ -1,48 +0,0 @@ -diff --git a/udpxy.c b/udpxy.c -index 43f213a..8f0e30d 100644 ---- a/udpxy.c -+++ b/udpxy.c -@@ -1423,7 +1423,7 @@ udpxy_main( int argc, char* const argv[] ) - } - } - -- rc = set_pidfile( g_udpxy_app, port, pidfile, sizeof(pidfile) ); -+ rc = set_pidfile( g_udpxy_app, pidfile, sizeof(pidfile) ); - if( 0 != rc ) { - mperror( g_flog, errno, "set_pidfile" ); - rc = ERR_INTERNAL; break; -diff --git a/util.c b/util.c -index 0ad34bb..6b7daf8 100644 ---- a/util.c -+++ b/util.c -@@ -302,7 +302,7 @@ make_pidfile( const char* fpath, pid_t pid, FILE* log ) - * (fail if destination directory is not writable) - */ - int --set_pidfile( const char* appname, int port, char* buf, size_t len ) -+set_pidfile( const char* appname, char* buf, size_t len ) - { - int n = -1; - -@@ -311,7 +311,7 @@ set_pidfile( const char* appname, int port, char* buf, size_t len ) - if( -1 == access(PIDFILE_DIR, W_OK ) ) - return -1; - -- n = snprintf( buf, len, "%s/%s%d.pid", PIDFILE_DIR, appname, port ); -+ n = snprintf( buf, len, "%s/%s.pid", PIDFILE_DIR, appname ); - if( n < 0 ) return EXIT_FAILURE; - - buf[ len - 1 ] = '\0'; -diff --git a/util.h b/util.h -index f274c7b..64a10d1 100644 ---- a/util.h -+++ b/util.h -@@ -66,7 +66,7 @@ make_pidfile( const char* fpath, pid_t pid, FILE* log ); - * (fail of destination directory is not writable) - */ - int --set_pidfile( const char* appname, int port, char* buf, size_t len ); -+set_pidfile( const char* appname, char* buf, size_t len ); - - /* write buffer to designated socket/file - * return number of bytes read/written or one of the error Modified: udpxy.service =================================================================== --- udpxy.service 2015-08-11 12:59:11 UTC (rev 138233) +++ udpxy.service 2015-08-11 13:11:50 UTC (rev 138234) @@ -4,7 +4,6 @@ [Service] Type=simple -PIDFile=/run/udpxy.pid ExecStart=/usr/bin/udpxy -T -S -p 4022 -B 256kb [Install]