rpms/jwhois/FC-4 jwhois-3.2.2-ru.patch, NONE, 1.1 jwhois-3.2.3-config-cvs.patch, NONE, 1.1 jwhois-3.2.3-sigpipe.patch, NONE, 1.1 jwhois-3.2.3.tar.gz.sig, NONE, 1.1 .cvsignore, 1.3, 1.4 jwhois.spec, 1.15, 1.16 sources, 1.3, 1.4 jwhois-3.2.2-arin.patch, 1.2, NONE jwhois-3.2.2-config-cvs.patch, 1.3, NONE jwhois-3.2.2-doublefree.patch, 1.1, NONE jwhois-3.2.2-update_2004.patch, 1.2, NONE jwhois-3.2.2-webbased.patch, 1.1, NONE
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Fri Apr 21 13:24:35 UTC 2006
Author: mitr
Update of /cvs/dist/rpms/jwhois/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv7573
Modified Files:
.cvsignore jwhois.spec sources
Added Files:
jwhois-3.2.2-ru.patch jwhois-3.2.3-config-cvs.patch
jwhois-3.2.3-sigpipe.patch jwhois-3.2.3.tar.gz.sig
Removed Files:
jwhois-3.2.2-arin.patch jwhois-3.2.2-config-cvs.patch
jwhois-3.2.2-doublefree.patch jwhois-3.2.2-update_2004.patch
jwhois-3.2.2-webbased.patch
Log Message:
Backport jwhois-3.2.3-3.3.fc5.1 to FC4.
jwhois-3.2.2-ru.patch:
ru.po | 1 -
1 files changed, 1 deletion(-)
--- NEW FILE jwhois-3.2.2-ru.patch ---
--- jwhois-3.2.2/po/ru.po.ru 2005-06-12 18:38:33.000000000 +0200
+++ jwhois-3.2.2/po/ru.po 2005-06-12 18:38:41.000000000 +0200
@@ -2,7 +2,6 @@
# Copyright (C) 2000 Free Software Foundation, Inc.
# Dmitry Mastrukov <dmitry at taurussoft.org>, 2000.
#
-#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: jwhois 2.4.1\n"
jwhois-3.2.3-config-cvs.patch:
jwhois.conf | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletion(-)
--- NEW FILE jwhois-3.2.3-config-cvs.patch ---
Note that this is not a pure CVS diff, a hunk adding the "connect-timeout"
option has been removed.
Index: example/jwhois.conf
===================================================================
RCS file: /sources/jwhois/jwhois/example/jwhois.conf,v
retrieving revision 1.119
retrieving revision 1.122
diff -u -r1.119 -r1.122
--- example/jwhois.conf 9 Jul 2005 18:31:51 -0000 1.119
+++ example/jwhois.conf 12 Apr 2006 14:23:40 -0000 1.122
@@ -180,7 +180,7 @@
"\\.cx$" = "whois.nic.cx";
"\\.cy$" = "whois.ripe.net";
"\\.cz$" = "whois.nic.cz";
- "\\.de$" = "www.denic.de";
+ "\\.de$" = "whois.denic.de";
"\\.dk$" = "whois.dk-hostmaster.dk";
"\\.do$" = "whois.nic.do";
"\\.dz$" = "whois.ripe.net";
@@ -189,6 +189,7 @@
"\\.ee$" = "whois.eenet.ee";
"\\.eg$" = "whois.ripe.net";
"\\.es$" = "www.nic.es";
+ "\\.eu$" = "whois.eu";
"\\.fi$" = "whois.ficora.fi";
"\\.fj$" = "whois.usp.ac.fj";
"\\.fm$" = "www.dot.fm";
@@ -866,6 +867,10 @@
form-element = "domainname";
form-extra = "service=WhoisData&lang=en&submit=Accept";
}
+ "whois\\.denic\\.de" {
+ whois-server = "whois.denic.de";
+ query-format = "-C UTF-8 -T dn,ace $*";
+ }
"whois\\.nic\\.ad\\.jp" {
query-format = "$*/e";
}
jwhois-3.2.3-sigpipe.patch:
http.c | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletion(-)
--- NEW FILE jwhois-3.2.3-sigpipe.patch ---
--- jwhois-3.2.3/src/http.c.sigpipe 2005-08-05 15:06:34.000000000 +0200
+++ jwhois-3.2.3/src/http.c 2005-08-05 15:18:12.000000000 +0200
@@ -19,6 +19,7 @@
#include <config.h>
+#include <signal.h>
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
@@ -269,7 +270,8 @@
/* Drats! */
if (errno)
{
- printf("[HTTP: %s: %s]\n", _("Unable to run web browser"), strerror(errno));
+ printf("[HTTP: %s: %s: %s]\n", _("Unable to run web browser"),
+ command[0], strerror(errno));
}
close(to_browser[0]);
close(from_browser[1]);
@@ -287,6 +289,8 @@
if (!isget && !post_as_file)
{
+ struct sigaction sa, old_sa;
+
/* Send POST data */
if (format)
{
@@ -301,7 +305,12 @@
element, wq->query,
extra ? "&" : "", extra ? extra : "");
}
+ sa.sa_handler = SIG_IGN;
+ sigemptyset (&sa.sa_mask);
+ sa.sa_flags = 0;
+ sigaction (SIGPIPE, &sa, &old_sa);
write(to_browser[1], data, strlen(data) + 1);
+ sigaction (SIGPIPE, &old_sa, NULL);
}
close(to_browser[1]);
--- NEW FILE jwhois-3.2.3.tar.gz.sig ---
ˆ?
Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/jwhois/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 9 Sep 2004 06:37:21 -0000 1.3
+++ .cvsignore 21 Apr 2006 13:24:31 -0000 1.4
@@ -1 +1 @@
-jwhois-3.2.2.tar.gz
+jwhois-3.2.3.tar.gz
Index: jwhois.spec
===================================================================
RCS file: /cvs/dist/rpms/jwhois/FC-4/jwhois.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- jwhois.spec 30 Apr 2005 17:46:23 -0000 1.15
+++ jwhois.spec 21 Apr 2006 13:24:32 -0000 1.16
@@ -1,14 +1,13 @@
Name: jwhois
-Version: 3.2.2
-Release: 14
+Version: 3.2.3
+Release: 3.3.fc4.1
URL: http://www.gnu.org/software/jwhois/
Source0: ftp://ftp.gnu.org/gnu/jwhois/jwhois-%{version}.tar.gz
-Patch0: jwhois-3.2.2-config-cvs.patch
-Patch1: jwhois-3.2.2-arin.patch
-Patch2: jwhois-3.2.2-doublefree.patch
-Patch3: jwhois-3.2.2-update_2004.patch
-Patch4: jwhois-3.2.2-webbased.patch
-Patch5: jwhois-3.2.2-afrinic.patch
+Source1: ftp://ftp.gnu.org/gnu/jwhois/jwhois-%{version}.tar.gz.sig
+Patch0: jwhois-3.2.3-config-cvs.patch
+Patch1: jwhois-3.2.2-afrinic.patch
+Patch2: jwhois-3.2.2-ru.patch
+Patch3: jwhois-3.2.3-sigpipe.patch
License: GPL
Group: Applications/Internet
Summary: Internet whois/nicname client.
@@ -22,11 +21,9 @@
%prep
%setup -q
%patch0 -p0 -b .config
-%patch1 -p1 -b .arin
-%patch2 -p1 -b .doublefree
-%patch3 -p1 -b .update_2004
-%patch4 -p1 -b .webbased
-%patch5 -p1 -b .afrinic
+%patch1 -p1 -b .afrinic
+%patch2 -p1 -b .ru
+%patch3 -p1 -b .sigpipe
iconv -f iso-8859-1 -t utf-8 < doc/sv/jwhois.1 > doc/sv/jwhois.1_
mv doc/sv/jwhois.1_ doc/sv/jwhois.1
@@ -37,10 +34,8 @@
%install
[ "$RPM_BUILD_ROOT" != "/" ] && rm -fr $RPM_BUILD_ROOT
-%makeinstall
-# Force compression of the info page so that the %%post knows its name.
-gzip $RPM_BUILD_ROOT/%{_infodir}/*.info*
-rm -f $RPM_BUILD_ROOT/%{_infodir}/dir
+make install DESTDIR="$RPM_BUILD_ROOT"
+rm -f "$RPM_BUILD_ROOT"%{_infodir}/dir
%find_lang jwhois
# Make "whois" jwhois.
@@ -49,7 +44,7 @@
%files -f %{name}.lang
%defattr(-,root,root)
-%doc AUTHORS COPYING NEWS README TODO
+%doc AUTHORS COPYING ChangeLog NEWS README TODO
%{_bindir}/*
%{_mandir}/man1/*
%{_mandir}/*/man1/jwhois.1*
@@ -57,17 +52,46 @@
%config(noreplace) %{_sysconfdir}/jwhois.conf
%post
-/sbin/install-info %{_infodir}/jwhois.info.gz %{_infodir}/dir
+/sbin/install-info %{_infodir}/jwhois.info %{_infodir}/dir
%preun
if [ $1 = 0 ]; then
- /sbin/install-info --delete %{_infodir}/jwhois.info.gz %{_infodir}/dir
+ /sbin/install-info --delete %{_infodir}/jwhois.info %{_infodir}/dir
fi
%clean
[ "$RPM_BUILD_ROOT" != "/" ] && rm -fr $RPM_BUILD_ROOT
%changelog
+* Wed Apr 19 2006 Miloslav Trmac <mitr at redhat.com> - 3.2.3-3.3.fc4.1
+- Update to upstream config as of Apr 19 2006 (#188366)
+
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 3.2.3-3.2.1
+- bump again for double-long bug on ppc(64)
+
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 3.2.3-3.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
+* Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
+- rebuilt
+
+* Fri Nov 11 2005 Miloslav Trmac <mitr at redhat.com> - 3.2.3-3
+- Ship ChangeLog
+
+* Fri Aug 5 2005 Miloslav Trmac <mitr at redhat.com> - 3.2.3-2
+- Don't die on SIGPIPE if a browser is not present, improve the error message
+ (#165149)
+
+* Mon Aug 1 2005 Miloslav Trmac <mitr at redhat.com> - 3.2.3-1
+- Update to jwhois-3.2.3
+- Don't compress jwhois.info manually
+
+* Sun Jun 12 2005 Miloslav Trmac <mitr at redhat.com> - 3.2.2-16
+- Remove 'fuzzy' from ru.po header to make charset conversion work (#160165)
+
+* Sat Jun 11 2005 Miloslav Trmac <mitr at redhat.com> - 3.2.2-15
+- Update to upstream config as of Jun 11 2005, remove patches accepted upstream
+
* Sat Apr 30 2005 Miloslav Trmac <mitr at redhat.com> - 3.2.2-14
- Add an AfriNIC range (#156178)
Index: sources
===================================================================
RCS file: /cvs/dist/rpms/jwhois/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 9 Sep 2004 06:37:21 -0000 1.3
+++ sources 21 Apr 2006 13:24:32 -0000 1.4
@@ -1 +1 @@
-3ad57a8cfc4f32fe41b1131711d34a78 jwhois-3.2.2.tar.gz
+1232661cebd79a9772f416599d3f5929 jwhois-3.2.3.tar.gz
--- jwhois-3.2.2-arin.patch DELETED ---
--- jwhois-3.2.2-config-cvs.patch DELETED ---
--- jwhois-3.2.2-doublefree.patch DELETED ---
--- jwhois-3.2.2-update_2004.patch DELETED ---
--- jwhois-3.2.2-webbased.patch DELETED ---
More information about the fedora-cvs-commits
mailing list