Browse Source

update to latest upstream version

Waldemar Brodkorb 10 years ago
parent
commit
ebf68a45b5

+ 3 - 3
package/socat/Makefile

@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		socat
-PKG_VERSION:=		1.7.2.3
+PKG_VERSION:=		1.7.2.4
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		6943f7a5e1ffd553ad2a900bbf05b83a
+PKG_MD5SUM:=		2a15dc3362f49d543abdbacc267d0a41
 PKG_DESCR:=		A multipurpose relay (SOcket CAT)
 PKG_SECTION:=		net/misc
 PKG_DEPENDS:=		libpthread
@@ -22,7 +22,7 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,SOCAT,socat,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_ENV+=		sc_cv_termios_ispeed="no" \
+CONFIGURE_ENV+=		sc_cv_termios_ispeed=no \
 			sc_cv_sys_crdly_shift=9 \
 			sc_cv_sys_tabdly_shift=11 \
 			sc_cv_sys_csize_shift=4

+ 2 - 3
package/socat/patches/501-honor_ldflags.patch → package/socat/patches/patch-Makefile_in

@@ -1,6 +1,5 @@
-diff -ruN socat-1.4-old/Makefile.in socat-1.4-new/Makefile.in
---- socat-1.7.2.2.orig/Makefile.in	2011-12-06 08:45:03.000000000 +0100
-+++ socat-1.7.2.2/Makefile.in	2013-12-24 16:37:21.000000000 +0100
+--- socat-1.7.2.4.orig/Makefile.in	2014-03-09 15:48:44.000000000 +0100
++++ socat-1.7.2.4/Makefile.in	2014-03-22 12:13:46.000000000 +0100
 @@ -38,7 +38,8 @@ INSTALL = @INSTALL@
  
  #0 CFLAGS = @CFLAGS@ $(CCOPTS) $(DEFS) $(INCLS)

+ 23 - 0
package/socat/patches/patch-configure

@@ -0,0 +1,23 @@
+--- socat-1.7.2.4.orig/configure	2014-03-09 20:57:51.000000000 +0100
++++ socat-1.7.2.4/configure	2014-03-22 12:20:13.000000000 +0100
+@@ -3347,18 +3347,8 @@ fi
+ # fail
+ 
+ 
+-
+-if test "$CC" = "gcc"; then
+-   CFLAGS="$CFLAGS -D_GNU_SOURCE -Wall -Wno-parentheses"
+-   ERRONWARN="-Werror -O0"
+-elif test "$CC" = "clang"; then
+-   CFLAGS="$CFLAGS -D_GNU_SOURCE -Wall -Wno-parentheses"
+-   ERRONWARN="-Werror -O0"
+-#elif Sun Studio
+-#   ERRONWARN="-errwarn"
+-else
+-   ERRONWARN=
+-fi
++CFLAGS="$CFLAGS -D_GNU_SOURCE -Wall -Wno-parentheses"
++ERRONWARN="-Werror -O0"
+ export CFLAGS
+ 
+