Hi
new release with a few minor fixes:
- fix handling of files >4Gb
- fix handling of files >2Gb on 32bit platforms (compile with
_FILE_OFFSET_BITS=64)
- fix file size limit test
- fix compiler warnings (missing #include)
- ....
tested on amd64
Index: Makefile
===================================================================
RCS file: /home/cvs/openbsd/ports/databases/tinycdb/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- Makefile 11 Mar 2013 02:52:09 -0000 1.3
+++ Makefile 22 Aug 2014 16:43:56 -0000
@@ -2,12 +2,9 @@
COMMENT = creating and reading constant databases
-V = 0.77
-REVISION = 0
-DISTNAME = tinycdb_$V
-PKGNAME = tinycdb-$V
+DISTNAME = tinycdb-0.78
CATEGORIES = databases
-SHARED_LIBS = cdb 0.0
+SHARED_LIBS = cdb 0.1
HOMEPAGE = http://www.corpit.ru/mjt/tinycdb.html
MASTER_SITES = http://www.corpit.ru/mjt/tinycdb/
@@ -19,19 +16,18 @@ PERMIT_PACKAGE_CDROM = Yes
WANTLIB = c
-WRKDIST = ${WRKDIR}/tinycdb-$V
MAKE_FLAGS += sysconfdir="${SYSCONFDIR}" LIBcdb_VERSION="${LIBcdb_VERSION}"
FAKE_FLAGS += ${MAKE_FLAGS} prefix="${PREFIX}"
.include <bsd.port.arch.mk>
.if ${PROPERTIES:Mno_shared}
-TEST_TARGET = tests
+TEST_TARGET = tests
.else
MAKE_FLAGS += INSTALLPROG="cdb-shared"
ALL_TARGET = all shared
INSTALL_TARGET = install install-sharedlib
-TEST_TARGET = tests-shared
+TEST_TARGET = tests-shared
.endif
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /home/cvs/openbsd/ports/databases/tinycdb/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo 18 May 2012 20:59:13 -0000 1.1.1.1
+++ distinfo 22 Aug 2014 16:31:06 -0000
@@ -1,5 +1,2 @@
-MD5 (tinycdb_0.77.tar.gz) = wA5fuWwwNWrDtnsqtdVkGw==
-RMD160 (tinycdb_0.77.tar.gz) = gDWB67hMxNt6vhaz+1uXjAVlJVM=
-SHA1 (tinycdb_0.77.tar.gz) = KHOl9hTpJeKEzXGnIWoNEDQK7Jw=
-SHA256 (tinycdb_0.77.tar.gz) = grw8zwr+0JeEcqBwzkUGZnuANeZdDcJDiOM4WNOba8Y=
-SIZE (tinycdb_0.77.tar.gz) = 37728
+SHA256 (tinycdb-0.78.tar.gz) = UGePQy2K2o1p9yjsEcMUDhUYE6eEfPMKYthvOnIO1jw=
+SIZE (tinycdb-0.78.tar.gz) = 36754
Index: patches/patch-Makefile
===================================================================
RCS file: /home/cvs/openbsd/ports/databases/tinycdb/patches/patch-Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-Makefile
--- patches/patch-Makefile 18 May 2012 20:59:13 -0000 1.1.1.1
+++ patches/patch-Makefile 22 Aug 2014 16:39:58 -0000
@@ -1,9 +1,9 @@
$OpenBSD: patch-Makefile,v 1.1.1.1 2012/05/18 20:59:13 sthen Exp $
---- Makefile.orig Sat Jan 31 18:12:21 2009
-+++ Makefile Sun Apr 19 15:49:39 2009
-@@ -7,19 +7,19 @@
+--- Makefile.orig Fri May 11 16:17:47 2012
++++ Makefile Fri Aug 22 18:37:43 2014
+@@ -6,19 +6,19 @@
- VERSION = 0.77
+ VERSION = 0.78
-prefix=/usr/local
+prefix?=/usr/local
@@ -20,12 +20,12 @@ $OpenBSD: patch-Makefile,v 1.1.1.1 2012/
-CC = cc
-CFLAGS = -O
-+CC?= cc
-+CFLAGS?= -O
-
- AR = ar
- ARFLAGS = rv
-@@ -29,7 +29,7 @@ NSS_CDB = libnss_cdb.so.2
++CC ?= cc
++CFLAGS ?= -O
+ CDEFS = -D_FILE_OFFSET_BITS=64
+ LD = $(CC)
+ LDFLAGS =
+@@ -31,7 +31,7 @@ NSS_CDB = libnss_cdb.so.2
LIBBASE = libcdb
LIB = $(LIBBASE).a
PICLIB = $(LIBBASE)_pic.a
@@ -34,16 +34,7 @@ $OpenBSD: patch-Makefile,v 1.1.1.1 2012/
SOLIB = $(LIBBASE).so
CDB_USELIB = $(LIB)
NSS_USELIB = $(PICLIB)
-@@ -85,7 +85,7 @@ $(SHAREDLIB): $(LIB_OBJS_PIC) $(LIBMAP)
- -rm -f $(SOLIB)
- ln -s $@ $(SOLIB)
- $(CC) $(CFLAGS) $(CFLAGS_SHARED) -o $@ \
-- $(CFLAGS_SONAME)$(SHAREDLIB) $(CFLAGS_VSCRIPT)$(LIBMAP) \
-+ $(CFLAGS_VSCRIPT)$(LIBMAP) \
- $(LIB_OBJS_PIC)
-
- cdb: cdb.o $(CDB_USELIB)
-@@ -137,7 +137,7 @@ do_install = \
+@@ -139,7 +139,7 @@ do_install = \
done
install-all: all $(INSTALLPROG)
@@ -52,7 +43,7 @@ $OpenBSD: patch-Makefile,v 1.1.1.1 2012/
cdb.h 644 $(includedir) - \
cdb.3 644 $(mandir)/man3 - \
cdb.1 644 $(mandir)/man1 - \
-@@ -152,8 +152,7 @@ install-nss: nss
+@@ -154,8 +154,7 @@ install-nss: nss
$(do_install)
install-sharedlib: sharedlib
@set -- $(SHAREDLIB) 644 $(libdir) - ; \
Index: patches/patch-tests_sh
===================================================================
RCS file: /home/cvs/openbsd/ports/databases/tinycdb/patches/patch-tests_sh,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-tests_sh
--- patches/patch-tests_sh 18 May 2012 20:59:13 -0000 1.1.1.1
+++ patches/patch-tests_sh 22 Aug 2014 16:39:58 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-tests_sh,v 1.1.1.1 2012/05/18 20:59:13 sthen Exp $
---- tests.sh.orig Mon Nov 3 22:08:55 2003
-+++ tests.sh Sun Apr 20 10:50:58 2008
-@@ -15,7 +15,7 @@ esac
+--- tests.sh.orig Fri May 11 16:16:30 2012
++++ tests.sh Fri Aug 22 18:39:47 2014
+@@ -14,7 +14,7 @@ esac
do_csum() {
echo checksum may fail if no md5sum program
@@ -10,12 +10,3 @@ $OpenBSD: patch-tests_sh,v 1.1.1.1 2012/
}
rm -f 1.cdb 1a.cdb
-@@ -106,7 +106,7 @@ echo $?
-
- echo Handling file size limits
- (
-- ulimit -f 3
-+ ulimit -f 4
- trap '' 25
- (
- for i in 0 1 2 3 4 5 6 7 8 9 ; do
