rpms/elinks/F-7 .cvsignore, 1.19, 1.20 elinks-0.11.1-negotiate.patch, 1.2, 1.3 elinks.spec, 1.39, 1.40 sources, 1.19, 1.20

[Ondrej Vasik (ovasik)]

Author: ovasik

Update of /cvs/extras/rpms/elinks/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12079

Modified Files:
	.cvsignore elinks-0.11.1-negotiate.patch elinks.spec sources 
Log Message:
update to latest upstream version(#297981 security issue)+changes already done in devel(licensing,package review updates)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/elinks/F-7/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore	26 Mar 2007 11:13:51 -0000	1.19
+++ .cvsignore	20 Sep 2007 14:27:31 -0000	1.20
@@ -1 +1 @@
-elinks-0.11.2.tar.bz2
+elinks-0.11.3.tar.bz2

elinks-0.11.1-negotiate.patch:

Index: elinks-0.11.1-negotiate.patch
===================================================================
RCS file: /cvs/extras/rpms/elinks/F-7/elinks-0.11.1-negotiate.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- elinks-0.11.1-negotiate.patch	12 Jun 2006 21:11:25 -0000	1.2
+++ elinks-0.11.1-negotiate.patch	20 Sep 2007 14:27:31 -0000	1.3
@@ -352,28 +352,18 @@
  
  struct http_version {
  	int major;
-@@ -551,7 +554,7 @@
- 	int trace = get_opt_bool("protocol.http.trace");
- 	struct string header;
- 	unsigned char *post_data = NULL;
--	struct auth_entry *entry;
-+	struct auth_entry *entry = NULL;
- 	struct uri *uri = conn->proxied_uri; /* Set to the real uri */
- 	unsigned char *optstr;
- 	int use_connect, talking_to_proxy;
-@@ -808,7 +811,11 @@
- 		add_crlf_to_string(&header);
+@@ -846,7 +849,11 @@
  	}
  
--	entry = find_auth(uri);
+  	/* CONNECT: The Authorization header is for the origin server only.  */
 +#ifdef CONFIG_GSSAPI
-+	if (http_negotiate_output(uri, &header) != 0)
++	if (http_negotiate_output(uri, &header) != 0) {
++#else
+  	if (!use_connect) {
 +#endif
-+		entry = find_auth(uri);
-+	
+ 		entry = find_auth(uri);
+  	}
  	if (entry) {
- 		if (entry->digest) {
- 			unsigned char *response;
 @@ -1327,12 +1334,13 @@
  	return 0;
  }


Index: elinks.spec
===================================================================
RCS file: /cvs/extras/rpms/elinks/F-7/elinks.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- elinks.spec	26 Mar 2007 11:13:51 -0000	1.39
+++ elinks.spec	20 Sep 2007 14:27:31 -0000	1.40
@@ -1,18 +1,14 @@
 Name:      elinks
 Summary:   A text-mode Web browser
-Version:   0.11.2
+Version:   0.11.3
 Release:   1%{?dist}
-License:   GPL
+License:   GPLv2
 URL:       http://elinks.or.cz
 Group:     Applications/Internet
-Source:    http://elinks.or.cz/download/elinks-%{version}.tar.bz2
+Source:    http://elinks.or.cz/download/%{name}-%{version}.tar.bz2
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires: autoconf
 BuildRequires: automake
-BuildRequires: pkgconfig
 BuildRequires: openssl-devel
-BuildRequires: krb5-devel
 BuildRequires: bzip2-devel
 BuildRequires: expat-devel
 BuildRequires: libidn-devel
@@ -29,7 +25,7 @@
 Patch5: elinks-0.10.1-xterm.patch
 Patch6: elinks-0.11.0-union.patch
 Patch7: elinks-0.11.1-negotiate.patch
-Patch8: elinks-0.11.1-badproxy.patch
+Patch8: elinks-0.11.3-macropen.patch
 
 %description
 Links is a text-based Web browser. Links does not display any images,
@@ -55,7 +51,7 @@
 %patch6 -p1
 # Fix #194096 – elinks should support negotiate-auth
 %patch7 -p1
-# Fix #210103 - elinks crashes when given bad HTTP_PROXY
+# Fix for open macro in new glibc 
 %patch8 -p1
 
 %build
@@ -78,7 +74,7 @@
 
 %files -f elinks.lang
 %defattr(-,root,root)
-%doc README SITES TODO
+%doc README SITES TODO COPYING
 %{_bindir}/links
 %{_bindir}/elinks
 %{_mandir}/man1/links.1*
@@ -86,6 +82,15 @@
 %{_mandir}/man5/*
 
 %changelog
+* Thu Sep 20 2007 Ondrej Vasik <ovasik at redhat.com> 0.11.3-1
+- update to new upstream version (required for #297981)
+- removed patch for #210103 , included in upstream release
+- updated patch elinks-0.11.1-negotiate.patch to pass build
+- fix of open macro(new glibc) by Joe Orton
+- changed license tag to GPLv2
+- added License file to doc, cleanup of dups in buildreq
+- (from package review by Tyler Owen(#225725))
+
 * Mon Mar 26 2007 Karel Zak <kzak at redhat.com> 0.11.2-1
 - update to new upstream version
 - cleanup spec file


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/elinks/F-7/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	26 Mar 2007 11:13:52 -0000	1.19
+++ sources	20 Sep 2007 14:27:31 -0000	1.20
@@ -1 +1 @@
-5a8f83afb527cf443f58b372136a81fc  elinks-0.11.2.tar.bz2
+a0eb50e18a2ac8e77d6b0df8f94bb5a6  elinks-0.11.3.tar.bz2