pool/socat
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 296233 from home:rudi_m:ul-all

Browse Source 
- remove socat-remove_date.patch, export BUILD_DATE instead
  (new feature since 1.7.2.4)
- run tests, don't abort yet

OBS-URL: https://build.opensuse.org/request/show/296233
OBS-URL: https://build.opensuse.org/package/show/network:utilities/socat?expand=0&rev=31
This commit is contained in:
Lars Müller 2015-04-14 19:19:27 +00:00 committed by Git OBS Bridge
parent 90a92c57ac
commit 7a2a054451
3 changed files with 18 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
socat-remove_date.patch
View File

@ -1,43 +0,0 @@
From: Pascal Bleser <pascal.bleser@opensuse.org>
Date: Sun, 02 Feb 2014 10:09:04 +0000
Subject: [PATCH] Remove __DATE__ and __TIME__ macros to avoid unneccessary rebuilds
References:
Upstream: no
remove __DATE__ and __TIME__ macros to avoid unneccessary rebuilds
fixes W: file-contains-date-and-time
---
socat.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
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,7 +70,6 @@
static const char socatversion[] =
#include "./VERSION"
;
-static const char timestamp[] = BUILD_DATE;
const char copyright_socat[] = "socat by Gerhard Rieger - see www.dest-unreach.org";
#if WITH_OPENSSL
@@ -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, 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) {
struct utsname ubuf;
fputs(copyright_socat, fd); fputc('\n', fd);
- fprintf(fd, "socat version %s on %s\n", socatversion, timestamp);
+ fprintf(fd, "socat version %s\n", socatversion);
Uname(&ubuf);
fprintf(fd, " running on %s version %s, release %s, machine %s\n",
ubuf.sysname, ubuf.version, ubuf.release, ubuf.machine);

7
socat.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Tue Apr 14 15:57:19 UTC 2015 - sweet_f_a@gmx.de
- remove socat-remove_date.patch, export BUILD_DATE instead
(new feature since 1.7.2.4)
- run tests, don't abort yet
-------------------------------------------------------------------
Wed Mar 25 15:29:21 UTC 2015 - p.drouand@gmail.com

13
socat.spec
View File

@ -21,7 +21,9 @@ Name: socat
BuildRequires: openssl-devel
BuildRequires: procps
BuildRequires: readline-devel
%if 0%{?suse_version}
BuildRequires: tcpd-devel
%endif
Version: 1.7.3.0
Release: 0
Url: http://www.dest-unreach.org/socat/
@ -29,7 +31,7 @@ Summary: Multipurpose relay for bidirectional data transfer
License: SUSE-GPL-2.0-with-openssl-exception and MIT
Group: Productivity/Networking/Other
Source: http://www.dest-unreach.org/socat/download/%{name}-%{version}.tar.bz2
Patch1: socat-remove_date.patch
Source1: %{name}.changes
Patch2: fix-linux-errqueue.h-not-found.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@ -43,10 +45,13 @@ combination of two of these.
%prep
%setup
%patch1 -p1
%patch2 -p1
%build
# export deterministic BUILD_DATE, format like "__DATE__ __TIME__"
CL_DATE="$(awk -F " - " 'NR==2{print $1;}' %{SOURCE1})"
test -n "$CL_DATE"
export BUILD_DATE="$(LANG=C date --utc -d "${CL_DATE}" +"%b %e %Y %T")"
export RPM_OPT_FLAGS="%{optflags} -fno-strict-aliasing"
%configure
%{__make} all
@ -59,6 +64,10 @@ mkdir -p \
${RPM_BUILD_ROOT}/%{_mandir}/man1
%{__make} DESTDIR=${RPM_BUILD_ROOT} install
%check
export TERM=ansi
make test || echo "TEST FAILED"
%files
%defattr(-,root,root)
%doc BUGREPORTS CHANGES COPYING COPYING.OpenSSL DEVELOPMENT EXAMPLES FAQ FILES PORTING README SECURITY VERSION examples