Accepting request 293117 from home:posophe:branches:network:utilities
update OBS-URL: https://build.opensuse.org/request/show/293117 OBS-URL: https://build.opensuse.org/package/show/network:utilities/socat?expand=0&rev=29
This commit is contained in:
Git OBS Bridge
parent
efec79ef14
commit
90a92c57ac
@ -25,13 +25,14 @@ Index: socat-1.7.2.4/configure.in
|
||||
===================================================================
|
||||
--- socat-1.7.2.4.orig/configure.in
|
||||
+++ socat-1.7.2.4/configure.in
|
||||
@@ -79,8 +79,7 @@ AC_HEADER_RESOLV()
|
||||
@@ -80,9 +80,7 @@
|
||||
|
||||
AC_CHECK_HEADERS(termios.h linux/if_tun.h)
|
||||
AC_CHECK_HEADERS(net/if_dl.h)
|
||||
-AC_CHECK_HEADERS(linux/types.h)
|
||||
-AC_CHECK_HEADER(linux/errqueue.h, AC_DEFINE(HAVE_LINUX_ERRQUEUE_H), [], [#include <linux/types.h>])
|
||||
+AC_CHECK_HEADERS(linux/types.h linux/errqueue.h)
|
||||
-AC_CHECK_HEADER(linux/errqueue.h, AC_DEFINE(HAVE_LINUX_ERRQUEUE_H), [], [#include <sys/time.h>
|
||||
-#include <linux/types.h>])
|
||||
+AC_CHECK_HEADERS(linux/types.h linux/errqueue.h sys/time.h)
|
||||
AC_CHECK_HEADERS(sys/utsname.h sys/select.h sys/file.h)
|
||||
AC_CHECK_HEADERS(util.h bsd/libutil.h libutil.h sys/stropts.h regex.h)
|
||||
AC_CHECK_HEADERS(linux/fs.h linux/ext2_fs.h)
|
||||
@ -39,12 +40,12 @@ Index: socat-1.7.2.4/configure
|
||||
===================================================================
|
||||
--- socat-1.7.2.4.orig/configure
|
||||
+++ socat-1.7.2.4/configure
|
||||
@@ -3968,26 +3968,19 @@ fi
|
||||
@@ -3980,27 +3980,19 @@
|
||||
|
||||
done
|
||||
|
||||
-for ac_header in linux/types.h
|
||||
+for ac_header in linux/types.h linux/errqueue.h
|
||||
+for ac_header in linux/types.h linux/errqueue.h sys/time.h
|
||||
do :
|
||||
- ac_fn_c_check_header_mongrel "$LINENO" "linux/types.h" "ac_cv_header_linux_types_h" "$ac_includes_default"
|
||||
-if test "x$ac_cv_header_linux_types_h" = xyes; then :
|
||||
@ -60,7 +61,8 @@ Index: socat-1.7.2.4/configure
|
||||
|
||||
done
|
||||
|
||||
-ac_fn_c_check_header_compile "$LINENO" "linux/errqueue.h" "ac_cv_header_linux_errqueue_h" "#include <linux/types.h>
|
||||
-ac_fn_c_check_header_compile "$LINENO" "linux/errqueue.h" "ac_cv_header_linux_errqueue_h" "#include <sys/time.h>
|
||||
-#include <linux/types.h>
|
||||
-"
|
||||
-if test "x$ac_cv_header_linux_errqueue_h" = xyes; then :
|
||||
- $as_echo "#define HAVE_LINUX_ERRQUEUE_H 1" >>confdefs.h
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:4b7739901c6fad1e460f3e5b1868fb4c2a1427febbba7a510cd2e42fd4941e09
|
||||
size 446644
|
||||
3
socat-1.7.3.0.tar.bz2
Normal file
3
socat-1.7.3.0.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:0767e850c0329b9fdf711c6cd468565cbbb28786ba1a8a1cbd5531d4016b3e04
|
||||
size 474633
|
||||
@ -15,22 +15,21 @@ Index: socat-1.7.2.3/socat.c
|
||||
===================================================================
|
||||
--- socat-1.7.2.3.orig/socat.c 2011-12-06 07:44:41.000000000 +0000
|
||||
+++ socat-1.7.2.3/socat.c 2014-03-03 19:31:00.000000000 +0000
|
||||
@@ -70,8 +70,6 @@ static int socat_newchild(void);
|
||||
@@ -70,7 +70,6 @@
|
||||
static const char socatversion[] =
|
||||
#include "./VERSION"
|
||||
;
|
||||
-static const char timestamp[] = __DATE__" "__TIME__;
|
||||
-
|
||||
-static const char timestamp[] = BUILD_DATE;
|
||||
|
||||
const char copyright_socat[] = "socat by Gerhard Rieger - see www.dest-unreach.org";
|
||||
#if WITH_OPENSSL
|
||||
const char copyright_openssl[] = "This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit. (http://www.openssl.org/)";
|
||||
@@ -273,7 +271,7 @@ int main(int argc, const char *argv[]) {
|
||||
@@ -273,7 +272,7 @@
|
||||
Info(copyright_openssl);
|
||||
Info(copyright_ssleay);
|
||||
#endif
|
||||
- Debug2("socat version %s on %s", socatversion, timestamp);
|
||||
+ Debug1("socat version %s", socatversion);
|
||||
xiosetenv("VERSION", socatversion, 1); /* SOCAT_VERSION */
|
||||
xiosetenv("VERSION", socatversion, 1, NULL); /* SOCAT_VERSION */
|
||||
uname(&ubuf); /* ! here we circumvent internal tracing (Uname) */
|
||||
Debug4("running on %s version %s, release %s, machine %s\n",
|
||||
@@ -363,7 +361,7 @@ void socat_version(FILE *fd) {
|
||||
|
||||
@ -1,3 +1,11 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Mar 25 15:29:21 UTC 2015 - p.drouand@gmail.com
|
||||
|
||||
- Update to version 1.7.3.0
|
||||
* Too many changes to list; please read the CHANGES file for news
|
||||
- Remove redundant %clean section
|
||||
- Update fix-linux-errqueue.h-not-found.patch and socat-remove_date.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sat Oct 25 06:53:21 UTC 2014 - coolo@suse.com
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package socat
|
||||
#
|
||||
# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2010 Pascal Bleser <pascal.bleser@opensuse.org>
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
@ -22,7 +22,7 @@ BuildRequires: openssl-devel
|
||||
BuildRequires: procps
|
||||
BuildRequires: readline-devel
|
||||
BuildRequires: tcpd-devel
|
||||
Version: 1.7.2.4
|
||||
Version: 1.7.3.0
|
||||
Release: 0
|
||||
Url: http://www.dest-unreach.org/socat/
|
||||
Summary: Multipurpose relay for bidirectional data transfer
|
||||
@ -59,9 +59,6 @@ mkdir -p \
|
||||
${RPM_BUILD_ROOT}/%{_mandir}/man1
|
||||
%{__make} DESTDIR=${RPM_BUILD_ROOT} install
|
||||
|
||||
%clean
|
||||
%{?buildroot:%__rm -rf "%{buildroot}"}
|
||||
|
||||
%files
|
||||
%defattr(-,root,root)
|
||||
%doc BUGREPORTS CHANGES COPYING COPYING.OpenSSL DEVELOPMENT EXAMPLES FAQ FILES PORTING README SECURITY VERSION examples
|
||||
|
||||
Loading…
Reference in New Issue
Block a user