[arch-commits] Commit in libnatpmp/repos (6 files)
Anatol Pomozov
anatolik at nymeria.archlinux.org
Sat Apr 12 23:46:12 UTC 2014
Date: Sunday, April 13, 2014 @ 01:46:12
Author: anatolik
Revision: 109301
archrelease: copy trunk to community-i686, community-x86_64
Added:
libnatpmp/repos/community-i686/PKGBUILD
(from rev 109300, libnatpmp/trunk/PKGBUILD)
libnatpmp/repos/community-i686/fix_header_issue.diff
(from rev 109300, libnatpmp/trunk/fix_header_issue.diff)
libnatpmp/repos/community-x86_64/PKGBUILD
(from rev 109300, libnatpmp/trunk/PKGBUILD)
libnatpmp/repos/community-x86_64/fix_header_issue.diff
(from rev 109300, libnatpmp/trunk/fix_header_issue.diff)
Deleted:
libnatpmp/repos/community-i686/PKGBUILD
libnatpmp/repos/community-x86_64/PKGBUILD
----------------------------------------+
/PKGBUILD | 74 +++++++++++++++++++++++++++++++
community-i686/PKGBUILD | 32 -------------
community-i686/fix_header_issue.diff | 59 ++++++++++++++++++++++++
community-x86_64/PKGBUILD | 32 -------------
community-x86_64/fix_header_issue.diff | 59 ++++++++++++++++++++++++
5 files changed, 192 insertions(+), 64 deletions(-)
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2014-04-12 23:45:29 UTC (rev 109300)
+++ community-i686/PKGBUILD 2014-04-12 23:46:12 UTC (rev 109301)
@@ -1,32 +0,0 @@
-# $Id$
-# Maintainer: Anatol Pomozov <anatol dot pomozov at gmail>
-# Contributor: Gustavo Alvarez <s1pkn07 at gmail.com>
-# Contributor: Kristjan Reinloo <mail at kreinloo dot net>
-# Contributor: Pierre Bourdon <delroth at gmail.com>
-
-pkgname=libnatpmp
-pkgver=20140401
-pkgrel=1
-pkgdesc='A portable and fully compliant implementation of the NAT-PMP protocol'
-arch=(i686 x86_64)
-url='http://miniupnp.free.fr/libnatpmp.html'
-license=(BSD)
-depends=(glibc)
-source=(http://miniupnp.tuxfamily.org/files/libnatpmp-$pkgver.tar.gz)
-sha1sums=('e9511edecb9a75dbe8c9ed39c0469a18dc7e950b')
-
-prepare() {
- sed -e 's/CFLAGS = /CFLAGS += /' -i $pkgname-$pkgver/Makefile
-}
-
-build() {
- cd $pkgname-$pkgver
- make
-}
-
-package() {
- cd $pkgname-$pkgver
- make INSTALLPREFIX="$pkgdir/usr" INSTALLDIRINC="$pkgdir/usr/include" install
- install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
- install -Dm644 natpmpc.1 "$pkgdir/usr/share/man/man1/natpmpc.1"
-}
Copied: libnatpmp/repos/community-i686/PKGBUILD (from rev 109300, libnatpmp/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2014-04-12 23:46:12 UTC (rev 109301)
@@ -0,0 +1,37 @@
+# $Id$
+# Maintainer: Anatol Pomozov <anatol dot pomozov at gmail>
+# Contributor: Gustavo Alvarez <s1pkn07 at gmail.com>
+# Contributor: Kristjan Reinloo <mail at kreinloo dot net>
+# Contributor: Pierre Bourdon <delroth at gmail.com>
+
+pkgname=libnatpmp
+pkgver=20140401
+pkgrel=2
+pkgdesc='A portable and fully compliant implementation of the NAT-PMP protocol'
+arch=(i686 x86_64)
+url='http://miniupnp.free.fr/libnatpmp.html'
+license=(BSD)
+depends=(glibc)
+source=(http://miniupnp.tuxfamily.org/files/libnatpmp-$pkgver.tar.gz
+ fix_header_issue.diff)
+sha1sums=('e9511edecb9a75dbe8c9ed39c0469a18dc7e950b'
+ '58baa3fe61edfc117ae92452fbc8176d095bd7d2')
+
+prepare() {
+ cd $pkgname-$pkgver
+ sed -e 's/CFLAGS = /CFLAGS += /' -i Makefile
+ # The patch comes from upstream https://github.com/miniupnp/libnatpmp/commit/f376ab72bc4de0b45f4e10c9b287b7ffe2a1fcd1
+ patch -p1 < "$srcdir"/fix_header_issue.diff
+}
+
+build() {
+ cd $pkgname-$pkgver
+ make
+}
+
+package() {
+ cd $pkgname-$pkgver
+ make INSTALLPREFIX="$pkgdir/usr" INSTALLDIRINC="$pkgdir/usr/include" install
+ install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+ install -Dm644 natpmpc.1 "$pkgdir/usr/share/man/man1/natpmpc.1"
+}
Copied: libnatpmp/repos/community-i686/fix_header_issue.diff (from rev 109300, libnatpmp/trunk/fix_header_issue.diff)
===================================================================
--- community-i686/fix_header_issue.diff (rev 0)
+++ community-i686/fix_header_issue.diff 2014-04-12 23:46:12 UTC (rev 109301)
@@ -0,0 +1,59 @@
+commit f376ab72bc4de0b45f4e10c9b287b7ffe2a1fcd1
+Author: Thomas Bernard <miniupnp at free.fr>
+Date: Thu Apr 10 23:09:44 2014 +0200
+
+ remove declspec.h problems. still has to be fixed definitely
+
+diff --git a/getgateway.h b/getgateway.h
+index d868f80..b3e17c6 100644
+--- a/getgateway.h
++++ b/getgateway.h
+@@ -1,6 +1,6 @@
+ /* $Id: getgateway.h,v 1.7 2013/09/10 20:09:04 nanard Exp $ */
+ /* libnatpmp
+-Copyright (c) 2007-2013, Thomas BERNARD
++Copyright (c) 2007-2014, Thomas BERNARD
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+@@ -38,12 +38,12 @@ typedef unsigned short uint16_t;
+ #endif
+ #define in_addr_t uint32_t
+ #endif
+-#include "declspec.h"
++/* #include "declspec.h" */
+
+ /* getdefaultgateway() :
+ * return value :
+ * 0 : success
+ * -1 : failure */
+-LIBSPEC int getdefaultgateway(in_addr_t * addr);
++/* LIBSPEC */int getdefaultgateway(in_addr_t * addr);
+
+ #endif
+diff --git a/natpmp.h b/natpmp.h
+index 62d113f..2399afb 100644
+--- a/natpmp.h
++++ b/natpmp.h
+@@ -1,6 +1,6 @@
+ /* $Id: natpmp.h,v 1.19 2014/04/01 09:39:29 nanard Exp $ */
+ /* libnatpmp
+-Copyright (c) 2007-2013, Thomas BERNARD
++Copyright (c) 2007-2014, Thomas BERNARD
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+@@ -48,10 +48,12 @@ typedef unsigned short uint16_t;
+ #define in_addr_t uint32_t
+ #include "declspec.h"
+ #else /* WIN32 */
++#define LIBSPEC
+ #include <netinet/in.h>
+ #endif /* WIN32 */
+
+-#include "declspec.h"
++/* causes problem when installing. Maybe should it be inlined ? */
++/* #include "declspec.h" */
+
+ typedef struct {
+ int s; /* socket */
Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD 2014-04-12 23:45:29 UTC (rev 109300)
+++ community-x86_64/PKGBUILD 2014-04-12 23:46:12 UTC (rev 109301)
@@ -1,32 +0,0 @@
-# $Id$
-# Maintainer: Anatol Pomozov <anatol dot pomozov at gmail>
-# Contributor: Gustavo Alvarez <s1pkn07 at gmail.com>
-# Contributor: Kristjan Reinloo <mail at kreinloo dot net>
-# Contributor: Pierre Bourdon <delroth at gmail.com>
-
-pkgname=libnatpmp
-pkgver=20140401
-pkgrel=1
-pkgdesc='A portable and fully compliant implementation of the NAT-PMP protocol'
-arch=(i686 x86_64)
-url='http://miniupnp.free.fr/libnatpmp.html'
-license=(BSD)
-depends=(glibc)
-source=(http://miniupnp.tuxfamily.org/files/libnatpmp-$pkgver.tar.gz)
-sha1sums=('e9511edecb9a75dbe8c9ed39c0469a18dc7e950b')
-
-prepare() {
- sed -e 's/CFLAGS = /CFLAGS += /' -i $pkgname-$pkgver/Makefile
-}
-
-build() {
- cd $pkgname-$pkgver
- make
-}
-
-package() {
- cd $pkgname-$pkgver
- make INSTALLPREFIX="$pkgdir/usr" INSTALLDIRINC="$pkgdir/usr/include" install
- install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
- install -Dm644 natpmpc.1 "$pkgdir/usr/share/man/man1/natpmpc.1"
-}
Copied: libnatpmp/repos/community-x86_64/PKGBUILD (from rev 109300, libnatpmp/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2014-04-12 23:46:12 UTC (rev 109301)
@@ -0,0 +1,37 @@
+# $Id$
+# Maintainer: Anatol Pomozov <anatol dot pomozov at gmail>
+# Contributor: Gustavo Alvarez <s1pkn07 at gmail.com>
+# Contributor: Kristjan Reinloo <mail at kreinloo dot net>
+# Contributor: Pierre Bourdon <delroth at gmail.com>
+
+pkgname=libnatpmp
+pkgver=20140401
+pkgrel=2
+pkgdesc='A portable and fully compliant implementation of the NAT-PMP protocol'
+arch=(i686 x86_64)
+url='http://miniupnp.free.fr/libnatpmp.html'
+license=(BSD)
+depends=(glibc)
+source=(http://miniupnp.tuxfamily.org/files/libnatpmp-$pkgver.tar.gz
+ fix_header_issue.diff)
+sha1sums=('e9511edecb9a75dbe8c9ed39c0469a18dc7e950b'
+ '58baa3fe61edfc117ae92452fbc8176d095bd7d2')
+
+prepare() {
+ cd $pkgname-$pkgver
+ sed -e 's/CFLAGS = /CFLAGS += /' -i Makefile
+ # The patch comes from upstream https://github.com/miniupnp/libnatpmp/commit/f376ab72bc4de0b45f4e10c9b287b7ffe2a1fcd1
+ patch -p1 < "$srcdir"/fix_header_issue.diff
+}
+
+build() {
+ cd $pkgname-$pkgver
+ make
+}
+
+package() {
+ cd $pkgname-$pkgver
+ make INSTALLPREFIX="$pkgdir/usr" INSTALLDIRINC="$pkgdir/usr/include" install
+ install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+ install -Dm644 natpmpc.1 "$pkgdir/usr/share/man/man1/natpmpc.1"
+}
Copied: libnatpmp/repos/community-x86_64/fix_header_issue.diff (from rev 109300, libnatpmp/trunk/fix_header_issue.diff)
===================================================================
--- community-x86_64/fix_header_issue.diff (rev 0)
+++ community-x86_64/fix_header_issue.diff 2014-04-12 23:46:12 UTC (rev 109301)
@@ -0,0 +1,59 @@
+commit f376ab72bc4de0b45f4e10c9b287b7ffe2a1fcd1
+Author: Thomas Bernard <miniupnp at free.fr>
+Date: Thu Apr 10 23:09:44 2014 +0200
+
+ remove declspec.h problems. still has to be fixed definitely
+
+diff --git a/getgateway.h b/getgateway.h
+index d868f80..b3e17c6 100644
+--- a/getgateway.h
++++ b/getgateway.h
+@@ -1,6 +1,6 @@
+ /* $Id: getgateway.h,v 1.7 2013/09/10 20:09:04 nanard Exp $ */
+ /* libnatpmp
+-Copyright (c) 2007-2013, Thomas BERNARD
++Copyright (c) 2007-2014, Thomas BERNARD
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+@@ -38,12 +38,12 @@ typedef unsigned short uint16_t;
+ #endif
+ #define in_addr_t uint32_t
+ #endif
+-#include "declspec.h"
++/* #include "declspec.h" */
+
+ /* getdefaultgateway() :
+ * return value :
+ * 0 : success
+ * -1 : failure */
+-LIBSPEC int getdefaultgateway(in_addr_t * addr);
++/* LIBSPEC */int getdefaultgateway(in_addr_t * addr);
+
+ #endif
+diff --git a/natpmp.h b/natpmp.h
+index 62d113f..2399afb 100644
+--- a/natpmp.h
++++ b/natpmp.h
+@@ -1,6 +1,6 @@
+ /* $Id: natpmp.h,v 1.19 2014/04/01 09:39:29 nanard Exp $ */
+ /* libnatpmp
+-Copyright (c) 2007-2013, Thomas BERNARD
++Copyright (c) 2007-2014, Thomas BERNARD
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+@@ -48,10 +48,12 @@ typedef unsigned short uint16_t;
+ #define in_addr_t uint32_t
+ #include "declspec.h"
+ #else /* WIN32 */
++#define LIBSPEC
+ #include <netinet/in.h>
+ #endif /* WIN32 */
+
+-#include "declspec.h"
++/* causes problem when installing. Maybe should it be inlined ? */
++/* #include "declspec.h" */
+
+ typedef struct {
+ int s; /* socket */
More information about the arch-commits
mailing list