Attachment 96720 Details for Bug 135385 – file.diff

[patch] file.diff

file.diff (text/plain), 2.80 KB, created by Edmondas Girkantas on 2009-06-08 22:00:12 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Edmondas Girkantas

Created: 2009-06-08 22:00:12 UTC

Size: 2.80 KB

patch

obsolete

>diff -ruN libopkele.orig/Makefile libopkele/Makefile
>--- libopkele.orig/Makefile	2009-06-08 23:37:33.000000000 +0300
>+++ libopkele/Makefile	2009-06-08 23:37:45.000000000 +0300
>@@ -6,8 +6,7 @@
> #
> 
> PORTNAME=	libopkele
>-PORTVERSION=	2.0
>-PORTREVISION=	1
>+PORTVERSION=	2.0.2
> CATEGORIES=	devel
> MASTER_SITES=	http://kin.klever.net/dist/
> 
>diff -ruN libopkele.orig/distinfo libopkele/distinfo
>--- libopkele.orig/distinfo	2009-06-08 23:37:33.000000000 +0300
>+++ libopkele/distinfo	2009-06-08 23:38:50.000000000 +0300
>@@ -1,3 +1,3 @@
>-MD5 (libopkele-2.0.tar.gz) = 86cf5bdbdd1a129df1c947090f81adb4
>-SHA256 (libopkele-2.0.tar.gz) = b89bbf1ddd08e69659cfc618278e22304c9e3e904f9d753e11fdaee868dc8485
>-SIZE (libopkele-2.0.tar.gz) = 407509
>+MD5 (libopkele-2.0.2.tar.gz) = f99bc4c4edd4d1ba095219c4e9302b8a
>+SHA256 (libopkele-2.0.2.tar.gz) = 1941642c689667b58e7d18191c4900be4f08a7c72e9493d52fa8c652d1c1c86b
>+SIZE (libopkele-2.0.2.tar.gz) = 393880
>diff -ruN libopkele.orig/files/patch-lib-util.cc libopkele/files/patch-lib-util.cc
>--- libopkele.orig/files/patch-lib-util.cc	2009-06-08 23:37:33.000000000 +0300
>+++ libopkele/files/patch-lib-util.cc	1970-01-01 03:00:00.000000000 +0300
>@@ -1,64 +0,0 @@
>-From 12837594b705ad10fdadfd0ba1bfc2249b3b1264 Mon Sep 17 00:00:00 2001
>-From: Michael Krelin <hacker@klever.net>
>-Date: Sun, 29  Jun  2008  16:08:01  +0000
>-Subject: Fixed w3c to unix timestamp conversion for FreeBSD
>-
>-Thanks to GÃ¶ran LÃ¶wkrantz for pointing both to the problem and possible
>-solution.
>-
>-Signed-off-by: Michael Krelin <hacker@klever.net>
>----
>-diff --git a/configure.ac b/configure.ac
>-index 3194718..3484146 100644
>---- configure.ac
>-+++ configure.ac
>-@@ -10,6 +10,7 @@ AC_PROG_LIBTOOL
>- PKG_PROG_PKG_CONFIG
>- 
>- AC_HEADER_STDC
>-+AC_CHECK_FUNCS([timegm])
>- 
>- AC_PATH_PROG([XSLTPROC],[xsltproc],[true])
>- 
>-diff --git a/lib/util.cc b/lib/util.cc
>-index d979502..a46ba2a 100644
>---- lib/util.cc
>-+++ lib/util.cc
>-@@ -122,6 +122,21 @@ namespace opkele {
>- 	    return rv;
>- 	}
>- 
>-+#ifndef HAVE_TIMEGM
>-+	static time_t timegm(struct tm *t) {
>-+	    char *tz = getenv("TZ");
>-+	    setenv("TZ","",1); tzset();
>-+	    time_t rv = mktime(t);
>-+	    if(tz)
>-+		setenv("TZ",tz,1);
>-+	    else
>-+		unsetenv("TZ");
>-+	    tzset();
>-+	    return rv;
>-+	}
>-+#	define timegm opkele::util::timegm
>-+#endif /* HAVE_TIMEGM */
>-+
>- 	time_t w3c_to_time(const string& w) {
>- 	    int fraction;
>- 	    struct tm tm_t;
>-@@ -145,10 +160,10 @@ namespace opkele {
>- 		throw failed_conversion(OPKELE_CP_ "failed to sscanf()");
>- 	    tm_t.tm_mon--;
>- 	    tm_t.tm_year-=1900;
>--	    time_t rv = mktime(&tm_t);
>-+	    time_t rv = timegm(&tm_t);
>- 	    if(rv==(time_t)-1)
>--		throw failed_conversion(OPKELE_CP_ "failed to mktime()");
>--	    return rv-timezone;
>-+		throw failed_conversion(OPKELE_CP_ "failed to gmtime()");
>-+	    return rv;
>- 	}
>- 
>- 	/*
>---
>-cgit v0.7.1-118-g42ef

Actions: View | Diff

Attachments on bug 135385: 96720