Hi, update to 1.3.9 + arc4random and -lcompat patches. Comments ? Ok ? Cheers Giovanni
Index: Makefile =================================================================== RCS file: /cvs/ports/x11/isomaster/Makefile,v retrieving revision 1.22 diff -u -p -u -p -r1.22 Makefile --- Makefile 11 Oct 2013 23:51:49 -0000 1.22 +++ Makefile 28 Nov 2013 19:13:06 -0000 @@ -2,8 +2,7 @@ COMMENT= gui cd image editor -DISTNAME= isomaster-1.3.7 -REVISION= 3 +DISTNAME= isomaster-1.3.9 CATEGORIES= x11 HOMEPAGE= http://littlesvr.ca/isomaster/ @@ -22,11 +21,11 @@ MODULES= devel/gettext LIB_DEPENDS= x11/gtk+2 RUN_DEPENDS= devel/desktop-file-utils -WANTLIB += X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes -WANTLIB += Xi Xinerama Xrandr Xrender atk-1.0 c cairo expat fontconfig -WANTLIB += freetype gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 +WANTLIB += X11 Xcomposite Xcursor Xdamage Xext Xfixes +WANTLIB += Xi Xinerama Xrandr Xrender atk-1.0 c cairo fontconfig +WANTLIB += freetype gio-2.0 glib-2.0 gobject-2.0 WANTLIB += m pango-1.0 pangocairo-1.0 pangoft2-1.0 -WANTLIB += pixman-1 png z pthread-stubs xcb gdk_pixbuf-2.0 gdk-x11-2.0 +WANTLIB += z gdk_pixbuf-2.0 gdk-x11-2.0 WANTLIB += gtk-x11-2.0 USE_GMAKE= Yes @@ -37,5 +36,7 @@ FAKE_FLAGS= MYMANPATH=${WRKINST}/${TRUEP pre-configure: ${SUBST_CMD} ${WRKSRC}/Makefile + @perl -pi -e 's/@\$$\(/\$$\(/g' ${WRKSRC}/Makefile \ + ${WRKSRC}/bk/Makefile ${WRKSRC}/iniparser-2.17/Makefile .include <bsd.port.mk> Index: distinfo =================================================================== RCS file: /cvs/ports/x11/isomaster/distinfo,v retrieving revision 1.10 diff -u -p -u -p -r1.10 distinfo --- distinfo 22 Mar 2010 11:08:50 -0000 1.10 +++ distinfo 28 Nov 2013 19:13:06 -0000 @@ -1,5 +1,2 @@ -MD5 (isomaster-1.3.7.tar.bz2) = Zj8tGnLi5fn9qjCtWF4Q8A== -RMD160 (isomaster-1.3.7.tar.bz2) = nv3SOcggclEPyiYwEgvTAriajRw= -SHA1 (isomaster-1.3.7.tar.bz2) = s/twoOccb4qvtCx/JjZ5Zuomm8w= -SHA256 (isomaster-1.3.7.tar.bz2) = JYsc4KnaNdwXLH1EhmBWxoc70pkphK8ehN6yX0p7R/c= -SIZE (isomaster-1.3.7.tar.bz2) = 211673 +SHA256 (isomaster-1.3.9.tar.bz2) = K/eYoZr0MRM5EUTEo/LzszNm9kDFaV01bBUeg8SdyFM= +SIZE (isomaster-1.3.9.tar.bz2) = 223514 Index: patches/patch-Makefile =================================================================== RCS file: /cvs/ports/x11/isomaster/patches/patch-Makefile,v retrieving revision 1.9 diff -u -p -u -p -r1.9 patch-Makefile --- patches/patch-Makefile 10 Oct 2010 15:24:41 -0000 1.9 +++ patches/patch-Makefile 28 Nov 2013 19:13:06 -0000 @@ -1,30 +1,35 @@ $OpenBSD: patch-Makefile,v 1.9 2010/10/10 15:24:41 jasper Exp $ ---- Makefile.orig Mon Jan 4 23:43:26 2010 -+++ Makefile Sun Oct 10 17:23:15 2010 -@@ -61,18 +61,20 @@ CPPFLAGS += -DICONPATH=\"$(ICONPATH)\" -DLOCALEDIR=\" - # the _FILE_OFFSET_BITS=64 is to enable stat() for large files on linuxish systems - CPPFLAGS += -D_FILE_OFFSET_BITS=64 - -+CPPFLAGS += -I${LOCALBASE}/include -+ - OBJECTS = isomaster.o window.o browser.o fsbrowser.o isobrowser.o error.o about.o settings.o boot.o editfile.o +--- Makefile.orig Thu Jan 19 20:58:06 2012 ++++ Makefile Thu Nov 28 18:15:39 2013 +@@ -59,7 +59,7 @@ ifndef WITHOUT_NLS + CFLAGS += -DENABLE_NLS + endif - all: translations isomaster.desktop isomaster +-CPPFLAGS += -DICONPATH=\"$(ICONPATH)\" -DLOCALEDIR=\"$(LOCALEDIR)\" -DDEFAULT_EDITOR=\"$(DEFAULT_EDITOR)\" -DDEFAULT_VIEWER=\"$(DEFAULT_VIEWER)\" -DVERSION=\"$(VERSION)\" ++CPPFLAGS += -I/usr/local/include -DICONPATH=\"$(ICONPATH)\" -DLOCALEDIR=\"$(LOCALEDIR)\" -DDEFAULT_EDITOR=\"$(DEFAULT_EDITOR)\" -DDEFAULT_VIEWER=\"$(DEFAULT_VIEWER)\" -DVERSION=\"$(VERSION)\" -DHAVE_ARC4RANDOM + # the _FILE_OFFSET_BITS=64 is to enable stat() for large files on linuxish systems + CPPFLAGS += -D_FILE_OFFSET_BITS=64 +@@ -75,15 +75,15 @@ all: translations isomaster.desktop isomaster isomaster: $(OBJECTS) lib iniparser @echo 'Linking isomaster' -- @$(CC) $(OBJECTS) bk/bk.a iniparser-2.17/libiniparser.a $(LDFLAGS) $(CFLAGS) $(CPPFLAGS) `pkg-config --libs gtk+-2.0` -o isomaster -+ $(CC) $(OBJECTS) bk/bk.a iniparser-2.17/libiniparser.a $(LDFLAGS) $(CFLAGS) $(CPPFLAGS) -lcompat `pkg-config --libs gtk+-2.0` -o isomaster + ifndef USE_SYSTEM_INIPARSER +- @$(CC) $(LDFLAGS) `pkg-config --libs gtk+-2.0` $(OBJECTS) bk/bk.a iniparser-2.17/libiniparser.a -o isomaster ++ $(CC) $(LDFLAGS) `pkg-config --libs gtk+-2.0` $(OBJECTS) bk/bk.a iniparser-2.17/libiniparser.a -o isomaster + else +- @$(CC) $(LDFLAGS) `pkg-config --libs gtk+-2.0` $(OBJECTS) bk/bk.a -liniparser -o isomaster ++ $(CC) $(LDFLAGS) `pkg-config --libs gtk+-2.0` $(OBJECTS) bk/bk.a -liniparser -o isomaster + endif # static pattern rule $(OBJECTS): %.o: %.c %.h bk/bk.h Makefile @echo 'Compiling' $< -- @$(CC) $< $(CFLAGS) $(CPPFLAGS) -c -o $@ -+ $(CC) $< $(CFLAGS) $(CPPFLAGS) -c -o $@ +- @$(CC) $(CFLAGS) $(CPPFLAGS) $< -c -o $@ ++ $(CC) $(CFLAGS) $(CPPFLAGS) $< -c -o $@ lib: cd bk && $(MAKE) -@@ -113,10 +115,6 @@ endif +@@ -128,10 +128,6 @@ endif $(INSTALL) -m 644 isomaster.1 $(DESTDIR)$(MYMANPATH) $(INSTALL) -d $(DESTDIR)$(DESKTOPPATH) $(INSTALL) -m 644 isomaster.desktop $(DESTDIR)$(DESKTOPPATH) Index: patches/patch-bk_bkCache_c =================================================================== RCS file: patches/patch-bk_bkCache_c diff -N patches/patch-bk_bkCache_c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-bk_bkCache_c 28 Nov 2013 19:13:06 -0000 @@ -0,0 +1,28 @@ +$OpenBSD$ +--- bk/bkCache.c.orig Thu Nov 28 17:54:29 2013 ++++ bk/bkCache.c Thu Nov 28 18:00:29 2013 +@@ -21,7 +21,7 @@ + + #include <string.h> + #include <stdio.h> +-#include <sys/timeb.h> ++#include <sys/time.h> + #include <sys/types.h> + #include <sys/stat.h> + +@@ -57,11 +57,11 @@ int wcWrite(VolInfo* volInfo, const char* block, size_ + + if(volInfo->writeProgressFunction != NULL) + { +- struct timeb timeNow; +- ftime(&timeNow); ++ struct timeval timeNow; ++ gettimeofday(&timeNow, NULL); + +- if(timeNow.time - volInfo->lastTimeCalledProgress.time >= 1 || +- timeNow.millitm - volInfo->lastTimeCalledProgress.millitm >= 100) ++ if(timeNow.tv_sec - volInfo->lastTimeCalledProgress.tv_sec >= 1 || ++ timeNow.tv_usec - volInfo->lastTimeCalledProgress.tv_usec >= 100) + { + BkStatStruct statStruct; + double percentComplete; Index: patches/patch-bk_bkMisc_c =================================================================== RCS file: patches/patch-bk_bkMisc_c diff -N patches/patch-bk_bkMisc_c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-bk_bkMisc_c 28 Nov 2013 19:13:06 -0000 @@ -0,0 +1,23 @@ +$OpenBSD$ +--- bk/bkMisc.c.orig Thu Nov 28 17:55:05 2013 ++++ bk/bkMisc.c Thu Nov 28 18:01:06 2013 +@@ -19,15 +19,15 @@ + + void maybeUpdateProgress(VolInfo* volInfo) + { +- struct timeb timeNow; ++ struct timeval timeNow; + + if(volInfo->progressFunction == NULL) + return; + +- ftime(&timeNow); ++ gettimeofday(&timeNow, NULL); + +- if(timeNow.time - volInfo->lastTimeCalledProgress.time >= 1 || +- timeNow.millitm - volInfo->lastTimeCalledProgress.millitm >= 100) ++ if(timeNow.tv_sec - volInfo->lastTimeCalledProgress.tv_sec >= 1 || ++ timeNow.tv_usec - volInfo->lastTimeCalledProgress.tv_usec >= 100) + { + volInfo->progressFunction(volInfo); + Index: patches/patch-bk_bk_h =================================================================== RCS file: patches/patch-bk_bk_h diff -N patches/patch-bk_bk_h --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-bk_bk_h 28 Nov 2013 19:13:06 -0000 @@ -0,0 +1,21 @@ +$OpenBSD$ +--- bk/bk.h.orig Thu Nov 28 17:56:51 2013 ++++ bk/bk.h Thu Nov 28 17:58:04 2013 +@@ -30,7 +30,7 @@ extern "C" + #include <stdlib.h> + #include <sys/types.h> + #include <limits.h> +-#include <sys/timeb.h> ++#include <sys/time.h> + #include <stdio.h> + + #include "bkError.h" +@@ -186,7 +186,7 @@ typedef struct VolInfo + int imageForWriting; + void(*progressFunction)(struct VolInfo*); + void(*writeProgressFunction)(struct VolInfo*, double); +- struct timeb lastTimeCalledProgress; ++ struct timeval lastTimeCalledProgress; + bk_off_t estimatedIsoSize; + BkHardLink* fileLocations; /* list of where to find regular files */ + char readWriteBuffer[READ_WRITE_BUFFER_SIZE]; Index: patches/patch-editfile_c =================================================================== RCS file: patches/patch-editfile_c diff -N patches/patch-editfile_c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-editfile_c 28 Nov 2013 19:13:06 -0000 @@ -0,0 +1,15 @@ +$OpenBSD$ +--- editfile.c.orig Wed Dec 5 00:31:55 2007 ++++ editfile.c Thu Nov 28 18:19:35 2013 +@@ -511,7 +511,11 @@ char* makeRandomFilename(const char* sourceName) + gotGoodChar = false; + while(!gotGoodChar) + { ++#ifdef HAVE_ARC4RANDOM ++ oneRandomChar = arc4random(); ++#else + oneRandomChar = random(); ++#endif + if(64 < oneRandomChar && oneRandomChar < 91) + { + gotGoodChar = true; Index: patches/patch-isomaster_c =================================================================== RCS file: patches/patch-isomaster_c diff -N patches/patch-isomaster_c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-isomaster_c 28 Nov 2013 19:13:06 -0000 @@ -0,0 +1,13 @@ +$OpenBSD$ +--- isomaster.c.orig Thu Nov 28 18:10:12 2013 ++++ isomaster.c Thu Nov 28 18:10:33 2013 +@@ -124,7 +124,9 @@ int main(int argc, char** argv) + if(argv[1] != NULL) + openIso(argv[1]); + ++#ifndef HAVE_ARC4RANDOM + srandom((int)time(NULL)); ++#endif + + gtk_main(); + Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/x11/isomaster/pkg/PLIST,v retrieving revision 1.9 diff -u -p -u -p -r1.9 PLIST --- pkg/PLIST 21 Dec 2009 20:46:01 -0000 1.9 +++ pkg/PLIST 28 Nov 2013 19:13:06 -0000 @@ -34,6 +34,10 @@ share/locale/hr/LC_MESSAGES/isomaster.mo share/locale/hu/LC_MESSAGES/isomaster.mo share/locale/id/LC_MESSAGES/isomaster.mo share/locale/it/LC_MESSAGES/isomaster.mo +share/locale/ja/LC_MESSAGES/isomaster.mo +share/locale/lt/ +share/locale/lt/LC_MESSAGES/ +share/locale/lt/LC_MESSAGES/isomaster.mo share/locale/lv/LC_MESSAGES/isomaster.mo share/locale/nb/LC_MESSAGES/isomaster.mo share/locale/nl/LC_MESSAGES/isomaster.mo @@ -58,6 +62,9 @@ share/locale/sr@latin/LC_MESSAGES/isomas share/locale/sv/LC_MESSAGES/isomaster.mo share/locale/tr/LC_MESSAGES/isomaster.mo share/locale/uk/LC_MESSAGES/isomaster.mo +share/locale/ur_PK/ +share/locale/ur_PK/LC_MESSAGES/ +share/locale/ur_PK/LC_MESSAGES/isomaster.mo share/locale/zh_CN/LC_MESSAGES/isomaster.mo share/locale/zh_TW/LC_MESSAGES/isomaster.mo @exec %D/bin/update-desktop-database
