rpms/httping/devel .cvsignore, 1.3, 1.4 httping-strndup.patch, 1.1, 1.2 httping.spec, 1.3, 1.4 sources, 1.3, 1.4

Mon Aug 31 09:35:39 UTC 2009

Author: sharkcz

Update of /cvs/pkgs/rpms/httping/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16079

Modified Files:
	.cvsignore httping-strndup.patch httping.spec sources 
Log Message:
* Mon Aug 31 2009 Dan Horák <dan[at]danny.cz> - 1.3.1-1
- Updated to new upstream version 1.3.1
- Updated the strndup patch



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/httping/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4

--- .cvsignore	16 Jul 2009 21:52:57 -0000	1.3
+++ .cvsignore	31 Aug 2009 09:35:39 -0000	1.4
@@ -1 +1 @@
-httping-1.3.0.tgz
+httping-1.3.1.tgz

httping-strndup.patch:
 str.c |    2 +-
 str.h |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Index: httping-strndup.patch
===================================================================
RCS file: /cvs/pkgs/rpms/httping/devel/httping-strndup.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- httping-strndup.patch	24 Jan 2009 10:07:03 -0000	1.1
+++ httping-strndup.patch	31 Aug 2009 09:35:39 -0000	1.2
@@ -1,54 +1,23 @@
-diff -up httping-1.2.9/http.c.old httping-1.2.9/http.c
---- httping-1.2.9/http.c.old	2008-12-30 15:29:18.000000000 +0200
-+++ httping-1.2.9/http.c	2008-12-30 15:29:57.000000000 +0200
-@@ -25,7 +25,7 @@
+diff -Nrup httping-1.3.1.orig/str.c httping-1.3.1/str.c
+--- httping-1.3.1.orig/str.c	2009-08-03 19:14:52.000000000 +0200
++++ httping-1.3.1/str.c	2009-08-31 11:15:44.000000000 +0200
+@@ -18,7 +18,7 @@
  #include "mem.h"
- #include "http.h"
- #include "io.h"
--#include "str.h"
-+/*#include "str.h"*/
  #include "utils.h"
  
- int get_HTTP_headers(int socket_h, SSL *ssl_h, char **headers, int timeout)
-diff -up httping-1.2.9/Makefile.old httping-1.2.9/Makefile
---- httping-1.2.9/Makefile.old	2008-12-30 15:34:16.000000000 +0200
-+++ httping-1.2.9/Makefile	2008-12-30 16:49:09.000000000 +0200
-@@ -17,7 +17,7 @@ include version
- DEBUG=-g # -D_DEBUG
- LDFLAGS+=-lssl -lcrypto $(DEBUG)
- CFLAGS+=-O2 -Wall -DVERSION=\"$(VERSION)\" $(DEBUG)
--
-+INSTALL=install
- OBJS=mem.o http.o io.o str.o error.o utils.o main.o tcp.o mssl.o res.o
- 
- all: httping
-@@ -28,8 +28,8 @@ httping: $(OBJS)
- 	# Oh, blatant plug: http://keetweej.vanheusden.com/wishlist.html
- 
- install: httping
--	cp httping $(DESTDIR)/usr/bin
--	cp httping.1 $(DESTDIR)/usr/share/man/man1/
-+	$(INSTALL) httping $(DESTDIR)/usr/bin/httping
-+	$(INSTALL) -m 0644 httping.1 $(DESTDIR)/usr/share/man/man1/httping.1
- 
- clean:
- 	rm -f $(OBJS) core httping
-diff -up httping-1.2.9/main.c.old httping-1.2.9/main.c
---- httping-1.2.9/main.c.old	2008-12-30 15:29:26.000000000 +0200
-+++ httping-1.2.9/main.c	2008-12-30 16:06:06.000000000 +0200
-@@ -33,12 +33,13 @@
- #include "gen.h"
- #include "http.h"
- #include "io.h"
--#include "str.h"
-+/*#include "str.h"*/
- #include "mem.h"
- #include "tcp.h"
- #include "res.h"
- #include "utils.h"
- #include "error.h"
-+//#include "version"
- 
- static volatile int stop = 0;
- 
-
+-#ifndef strndup
++#ifndef have_strndup
+ char *strndup(char *in, int size)
+ {
+ 	char *out = mymalloc(size + 1, "strndup");
+diff -Nrup httping-1.3.1.orig/str.h httping-1.3.1/str.h
+--- httping-1.3.1.orig/str.h	2009-08-03 19:14:52.000000000 +0200
++++ httping-1.3.1/str.h	2009-08-31 11:15:44.000000000 +0200
+@@ -15,6 +15,6 @@
+ 
+ #include <string.h>
+ 
+-#ifndef strndup
++#ifndef have_strndup
+ char *strndup(char *in, int size);
+ #endif


Index: httping.spec
===================================================================
RCS file: /cvs/pkgs/rpms/httping/devel/httping.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- httping.spec	16 Jul 2009 21:52:58 -0000	1.3
+++ httping.spec	31 Aug 2009 09:35:39 -0000	1.4
@@ -1,5 +1,5 @@
 Name:           httping
-Version:        1.3.0
+Version:        1.3.1
 Release:        1%{?dist}
 Summary:        Ping alike tool for http requests
 
@@ -24,14 +24,17 @@ also takes time.
 %setup -q
 %patch0 -p1 -b .strndup
 
+
 %build
-CFLAGS="%{optflags}" make %{?_smp_mflags} DEBUG=""
+make %{?_smp_mflags} DEBUG="" OFLAGS="%{optflags} -Dhave_strndup"
 
 
 %install
 rm -rf %{buildroot}
 make install INSTALL="install -Dp" DESTDIR=%{buildroot}
 
+rm -rf %{buildroot}%{_prefix}/doc
+
 
 %clean
 rm -rf %{buildroot}
@@ -45,6 +48,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Aug 31 2009 Dan Horák <dan[at]danny.cz> - 1.3.1-1
+- Updated to new upstream version 1.3.1
+- Updated the strndup patch
+
 * Thu Jul 16 2009 Fabian Affolter <fabian at bernewireless.net> - 1.3.0-1
 - Updated to new upstream version
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/httping/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	16 Jul 2009 21:52:58 -0000	1.3
+++ sources	31 Aug 2009 09:35:39 -0000	1.4
@@ -1 +1 @@
-41c912a9ecc904e51d7260053fc2195c  httping-1.3.0.tgz
+fb742d577d3e7a8ea75cf97f7eb802f2  httping-1.3.1.tgz


