[arch-commits] Commit in httptunnel/trunk (PKGBUILD httptunnel-3.3-build-fix.patch)

[Lukas Fleischer]

    Date: Tuesday, July 22, 2014 @ 10:57:05
  Author: lfleischer
Revision: 116093

upgpkg: httptunnel 3.3-4

* Add build fix (fixes FS#39330).
* .MTREE rebuild.

Added:
  httptunnel/trunk/httptunnel-3.3-build-fix.patch
Modified:
  httptunnel/trunk/PKGBUILD

--------------------------------+
 PKGBUILD                       |   13 ++++-
 httptunnel-3.3-build-fix.patch |   93 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 103 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-07-22 08:55:08 UTC (rev 116092)
+++ PKGBUILD	2014-07-22 08:57:05 UTC (rev 116093)
@@ -5,15 +5,22 @@
 
 pkgname=httptunnel
 pkgver=3.3
-pkgrel=3
+pkgrel=4
 pkgdesc="Creates a bidirectional virtual data connection tunnelled in HTTP requests"
 arch=('i686' 'x86_64')
 url="http://www.nocrew.org/software/httptunnel"
 license=('GPL2')
 depends=('glibc')
-source=("http://www.nocrew.org/software/${pkgname}/$pkgname-$pkgver.tar.gz")
-md5sums=('493cc0f5f21e9955db27ee9cd9a976d5')
+source=("http://www.nocrew.org/software/${pkgname}/$pkgname-$pkgver.tar.gz"
+        'httptunnel-3.3-build-fix.patch')
+md5sums=('493cc0f5f21e9955db27ee9cd9a976d5'
+         '65c1f8a2a847fb4af106c9358f9e0be8')
 
+prepare() {
+  cd "${srcdir}"/$pkgname-$pkgver
+  patch -p0 -i ../httptunnel-3.3-build-fix.patch
+}
+
 build() {
   cd "${srcdir}"/$pkgname-$pkgver
   ./configure --prefix=/usr --mandir=/usr/share/man

Added: httptunnel-3.3-build-fix.patch
===================================================================
--- httptunnel-3.3-build-fix.patch	                        (rev 0)
+++ httptunnel-3.3-build-fix.patch	2014-07-22 08:57:05 UTC (rev 116093)
@@ -0,0 +1,93 @@
+--- configure.old	2001-02-25 13:07:03.000000000 +0100
++++ configure	2014-07-22 10:49:32.449242277 +0200
+@@ -1573,45 +1573,12 @@ EOF
+ 
+ fi
+ 
+-for ac_hdr in fcntl.h syslog.h unistd.h sys/poll.h
+-do
+-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:1581: checking for $ac_hdr" >&5
+-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+-  echo $ac_n "(cached) $ac_c" 1>&6
+-else
+-  cat > conftest.$ac_ext <<EOF
+-#line 1586 "configure"
+-#include "confdefs.h"
+-#include <$ac_hdr>
++cat >> confdefs.h <<EOF
++#define HAVE_FCNTL_H 1
++#define HAVE_SYSLOG_H 1
++#define HAVE_UNISTD_H 1
++#define HAVE_SYS_POLL_H 1
+ EOF
+-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:1591: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+-if test -z "$ac_err"; then
+-  rm -rf conftest*
+-  eval "ac_cv_header_$ac_safe=yes"
+-else
+-  echo "$ac_err" >&5
+-  echo "configure: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
+-  rm -rf conftest*
+-  eval "ac_cv_header_$ac_safe=no"
+-fi
+-rm -f conftest*
+-fi
+-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+-  echo "$ac_t""yes" 1>&6
+-    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
+-  cat >> confdefs.h <<EOF
+-#define $ac_tr_hdr 1
+-EOF
+- 
+-else
+-  echo "$ac_t""no" 1>&6
+-fi
+-done
+ 
+ 
+ echo $ac_n "checking for working const""... $ac_c" 1>&6
+@@ -1729,39 +1696,6 @@ EOF
+  ;;
+ esac
+ 
+-echo $ac_n "checking for size_t""... $ac_c" 1>&6
+-echo "configure:1734: checking for size_t" >&5
+-if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
+-  echo $ac_n "(cached) $ac_c" 1>&6
+-else
+-  cat > conftest.$ac_ext <<EOF
+-#line 1739 "configure"
+-#include "confdefs.h"
+-#include <sys/types.h>
+-#if STDC_HEADERS
+-#include <stdlib.h>
+-#include <stddef.h>
+-#endif
+-EOF
+-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+-  egrep "(^|[^a-zA-Z_0-9])size_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
+-  rm -rf conftest*
+-  ac_cv_type_size_t=yes
+-else
+-  rm -rf conftest*
+-  ac_cv_type_size_t=no
+-fi
+-rm -f conftest*
+-
+-fi
+-echo "$ac_t""$ac_cv_type_size_t" 1>&6
+-if test $ac_cv_type_size_t = no; then
+-  cat >> confdefs.h <<\EOF
+-#define size_t unsigned
+-EOF
+-
+-fi
+-
+ ##AC_CHECK_TYPE(socklen_t, unsigned) # doesn't search <sys/socket.h>
+ echo $ac_n "checking for socklen_t""... $ac_c" 1>&6
+ echo "configure:1768: checking for socklen_t" >&5