cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix gcc4

Browse Source
This commit is contained in:
espie 2010-05-24 22:03:21 +00:00
parent a4f69c10a1
commit d2e4e9943c
6 changed files with 61 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sysutils/openpoppassd/patches/patch-log_c Normal file
View File

@ -0,0 +1,11 @@
$OpenBSD: patch-log_c,v 1.1 2010/05/24 22:03:21 espie Exp $
--- log.c.orig Fri Aug 3 23:05:05 2007
+++ log.c Tue May 25 00:02:36 2010
@@ -32,6 +32,7 @@
#include "poppassd.h"
+#define debug debug_static
static int debug;
void logit(int, const char *, ...);

8
sysutils/upsd/patches/patch-apc_static_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-apc_static_c,v 1.1 2002/08/05 02:25:30 kevlo Exp $
--- apc_static.c.orig Fri Aug 2 21:44:23 1996
+++ apc_static.c Mon Aug 5 10:01:35 2002
@@ -91,9 +91,12 @@ static struct ups_val apc_SmartUPS_230_v
$OpenBSD: patch-apc_static_c,v 1.2 2010/05/24 22:08:11 espie Exp $
--- apc_static.c.orig Fri Aug 2 23:44:23 1996
+++ apc_static.c Sat May 22 17:23:37 2010
@@ -91,9 +91,12 @@ static struct ups_val apc_SmartUPS_230_values[] = {
{SMART_LOWBATDUR, {number: 7}},
{SMART_LOWBATDUR, {number: 10}},

21
sysutils/upsd/patches/patch-misc_c Normal file
View File

@ -0,0 +1,21 @@
$OpenBSD: patch-misc_c,v 1.1 2010/05/24 22:08:11 espie Exp $
--- misc.c.orig Tue May 25 00:03:48 2010
+++ misc.c Tue May 25 00:04:23 2010
@@ -105,7 +105,7 @@ whereid(id, list, size)
if(((struct ident *)list)->id == 0) {
return NULL;
}
- (char *)list += size;
+ list = (char *)list + size;
}
return list;
}
@@ -122,7 +122,7 @@ wherename(name, list, size)
register void *list;
register size_t size;
{
- for(;((struct ident *)list)->id != 0;(char *)list += size) {
+ for(;((struct ident *)list)->id != 0;list = (char *)list + size) {
if(((struct ident *)list)->name == name) {
return list;
}

8
www/bk2site/patches/patch-iwebstream_C
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-iwebstream_C,v 1.1 2002/10/17 11:25:39 naddy Exp $
--- iwebstream.C.orig Wed Oct 16 23:57:13 2002
+++ iwebstream.C Wed Oct 16 23:58:06 2002
$OpenBSD: patch-iwebstream_C,v 1.2 2010/05/24 22:12:41 espie Exp $
--- iwebstream.C.orig Wed Oct 17 14:05:24 2001
+++ iwebstream.C Sat May 22 12:51:58 2010
@@ -33,7 +33,7 @@
//#define DEBUG_TIMEOUT
@ -10,7 +10,7 @@ $OpenBSD: patch-iwebstream_C,v 1.1 2002/10/17 11:25:39 naddy Exp $
string origurl = url;
string method;
string host;
@@ -424,8 +424,8 @@ bool iwebstream::findAndPass(const strin
@@ -424,8 +424,8 @@ bool iwebstream::findAndPass(const string & s){
// Case is ignored in comparisions.
// If begin is not found, return "". Move position to point to char after end;
// If end == "" then just find begin and place position just after it

15
www/bk2site/patches/patch-iwebstream_H Normal file
View File

@ -0,0 +1,15 @@
$OpenBSD: patch-iwebstream_H,v 1.1 2010/05/24 22:12:41 espie Exp $
--- iwebstream.H.orig Tue May 25 00:10:46 2010
+++ iwebstream.H Tue May 25 00:10:57 2010
@@ -58,9 +58,9 @@ class iwebstream { (public)
return !operator==(x);};
//find the next occurance of s, set position to point to it
- bool iwebstream::find(const string & s);
+ bool find(const string & s);
//find the next occurance of s, set position to point past it
- bool iwebstream::findAndPass(const string & s);
+ bool findAndPass(const string & s);
//return whatever is between the next begin & end. If begin is not found,
// return ""

12
www/bk2site/patches/patch-reference_C
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-reference_C,v 1.1 2002/10/17 11:25:39 naddy Exp $
$OpenBSD: patch-reference_C,v 1.2 2010/05/24 22:12:41 espie Exp $
--- reference.C.orig Thu Dec 6 15:29:25 2001
+++ reference.C Thu Oct 17 00:10:39 2002
@@ -804,19 +804,19 @@ string reference::sendAsHTML(const strin
+++ reference.C Sat May 22 12:51:58 2010
@@ -804,19 +804,19 @@ string reference::sendAsHTML(const string & templ,
else
replaceAll(outputString, "%NEW", "");
else if (FORMATVARS[i] == "%TIMEFCRE"){
@ -24,7 +24,7 @@ $OpenBSD: patch-reference_C,v 1.1 2002/10/17 11:25:39 naddy Exp $
string c(ctime(&l));
c = c.substr(0,c.size()-1);
replaceAll(outputString, "%TIMEFVIS", c);
@@ -1189,7 +1189,7 @@ time_t referenceTree::setFolderCreationT
@@ -1189,7 +1189,7 @@ time_t referenceTree::setFolderCreationToMaxChildren()
The hard work is done by FolderCommentParser
*/
@ -33,7 +33,7 @@ $OpenBSD: patch-reference_C,v 1.1 2002/10/17 11:25:39 naddy Exp $
for (vector<reference>::iterator i = contents.begin(); i != contents.end(); ++i){
reference& r = *i;
replaceAll(r.comment,"&lt;","<");
@@ -1398,7 +1398,7 @@ void referenceTree::merge(const referenc
@@ -1398,7 +1398,7 @@ void referenceTree::merge(const referenceTree & rt)
returns the number of elements added.
Only adds URLS that are not Private and not Aliasof another one and
are not under avoidFolder. */
@ -42,7 +42,7 @@ $OpenBSD: patch-reference_C,v 1.1 2002/10/17 11:25:39 naddy Exp $
{
for (vector<reference>::iterator i = contents.begin(); i != contents.end(); ++i){
reference & r = *i;
@@ -1466,10 +1466,10 @@ void referenceTree::createSite(const str
@@ -1466,10 +1466,10 @@ void referenceTree::createSite(const string varValues[
void referenceTree::createSiteH(const string varValues[], vector<reference> & allReferences,
channelContainer & channels,
fileView & baseView, fileView & otherView,