OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: r...@openpkg.org
Module: openpkg-src Date: 05-Apr-2009 00:00:24
Branch: HEAD Handle: 2009040423002300
Added files:
openpkg-src/libopkele libopkele.patch
Modified files:
openpkg-src/libopkele libopkele.spec
Log:
more vendor fixes
Summary:
Revision Changes Path
1.3 +101 -0 openpkg-src/libopkele/libopkele.patch
1.3 +3 -1 openpkg-src/libopkele/libopkele.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/libopkele/libopkele.patch
============================================================================
$ cvs diff -u -r0 -r1.3 libopkele.patch
--- /dev/null 2009-04-05 00:00:24 +0200
+++ libopkele.patch 2009-04-05 00:00:24 +0200
@@ -0,0 +1,101 @@
+Index: include/opkele/iterator.h
+--- include/opkele/iterator.h.orig 2008-09-22 22:14:18 +0200
++++ include/opkele/iterator.h 2009-04-04 23:53:20 +0200
+@@ -103,7 +103,7 @@
+ ~forward_iterator_proxy() { delete I; }
+
+ forward_iterator_proxy& operator=(const
forward_iterator_proxy<T,TR,TP>& x) {
+- delete I; I = x.I->dup(); return *this; }
++ delete I; I = x.I->dup(); }
+
+ bool operator==(const forward_iterator_proxy<T,TR,TP>& x) const
{
+ return (*I)==(*(x.I)); }
+Index: lib/discovery.cc
+--- lib/discovery.cc.orig 2008-06-29 20:45:44 +0200
++++ lib/discovery.cc 2009-04-04 23:53:20 +0200
+@@ -253,12 +253,9 @@
+ util::tidy_doc_t td = util::tidy_doc_t::create();
+ if(!td)
+ throw exception_tidy(OPKELE_CP_ "failed to create
htmltidy document");
+-#ifdef NDEBUG
+- td.opt_set(TidyQuiet,true);
+- td.opt_set(TidyShowWarnings,false);
+-#else /* NDEBUG */
++#ifndef NDEBUG
+ td.opt_set(TidyQuiet,false);
+- td.opt_set(TidyShowWarnings,true);
++ td.opt_set(TidyShowWarnings,false);
+ #endif /* NDEBUG */
+ td.opt_set(TidyForceOutput,true);
+ td.opt_set(TidyXhtmlOut,true);
+@@ -453,25 +450,36 @@
+ --skipping; return;
+ }
+ if(is_qelement(n,NSURI_XRD "\tType")) {
+- assert(xrd); assert(xrd_service); assert(cdata==&cdata_buf);
+- xrd_service->types.insert(cdata_buf);
++ if(xrd && xrd_service) {
++ assert(cdata==&cdata_buf);
++ xrd_service->types.insert(cdata_buf);
++ }
+ }else if(is_qelement(n,NSURI_XRD "\tService")) {
+- assert(xrd); assert(xrd_service);
+- assert(!pt_stack.empty());
+- assert(pt_stack.back()==(NSURI_XRD "\tService"));
+- pt_stack.pop_back();
+- xrd_service = 0;
+- }else if(is_qelement(n,NSURI_XRD "\tStatus")) {
+- assert(xrd);
+- if(is_qelement(pt_stack.back().c_str(),n)) {
+- assert(cdata==&status_string);
++ if(!(xrd && xrd_service)) {
++ skipping = -1;
++ }else{
++ assert(!pt_stack.empty());
++ assert(pt_stack.back()==(NSURI_XRD "\tService"));
+ pt_stack.pop_back();
+- if(status_code!=100)
+- skipping = -1;
++ xrd_service = 0;
++ }
++ }else if(is_qelement(n,NSURI_XRD "\tStatus")) {
++ if(!xrd) {
++ skipping=-1;
++ }else{
++ if(is_qelement(pt_stack.back().c_str(),n)) {
++ assert(cdata==&status_string);
++ pt_stack.pop_back();
++ if(status_code!=100)
++ skipping = -1;
++ }
+ }
+ }else if(is_qelement(n,NSURI_XRD "\tExpires")) {
+- assert(xrd);
+- xrd->expires = util::w3c_to_time(cdata_buf);
++ if(!xrd) {
++ skipping=-1;
++ }else{
++ xrd->expires = util::w3c_to_time(cdata_buf);
++ }
+ }else if((xmode&xmode_html) && is_element(n,"head")) {
+ skipping = -1;
+ }
+Index: lib/util.cc
+--- lib/util.cc.orig 2008-09-22 22:14:18 +0200
++++ lib/util.cc 2009-04-04 23:53:20 +0200
+@@ -210,7 +210,6 @@
+ string url_decode(const string& str) {
+ string rv;
+ back_insert_iterator<string> ii(rv);
+- char tmp[3]; tmp[2] = 0;
+ for(string::const_iterator i=str.begin(),ie=str.end();
+ i!=ie;++i) {
+ switch(*i) {
+@@ -218,6 +217,7 @@
+ *(ii++) = ' '; break;
+ case '%':
+ ++i;
++ static char tmp[3] = {0,0,0};
+ if(i==ie)
+ throw failed_conversion(OPKELE_CP_ "trailing
percent in the url-encoded string");
+ tmp[0] = *(i++);
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/libopkele/libopkele.spec
============================================================================
$ cvs diff -u -r1.2 -r1.3 libopkele.spec
--- openpkg-src/libopkele/libopkele.spec 23 Nov 2008 08:00:40 -0000
1.2
+++ openpkg-src/libopkele/libopkele.spec 4 Apr 2009 22:00:23 -0000
1.3
@@ -32,10 +32,11 @@
Group: Cryptography
License: MIT-style
Version: 2.0.1
-Release: 20081123
+Release: 20090404
# list of sources
Source0: http://kin.klever.net/dist/libopkele-%{version}.tar.bz2
+Patch0: libopkele.patch
# build information
Prefix: %{l_prefix}
@@ -61,6 +62,7 @@
%prep
%setup -q
+ %patch -p0
%build
CC="%{l_cc}" \
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
