* [gentoo-commits] repo/gentoo:master commit in: dev-db/cdb/, dev-db/cdb/files/
@ 2021-04-19 19:12 Sam James
0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2021-04-19 19:12 UTC (permalink / raw
To: gentoo-commits
commit: d7e09b50da172482e0ff2f428b9af7f91d758aa2
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 19 16:53:46 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Apr 19 19:12:00 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d7e09b50
dev-db/cdb: port to EAPI 7
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-db/cdb/cdb-0.75-r4.ebuild | 20 +++++----
dev-db/cdb/files/cdb-0.75-errno.diff | 4 +-
dev-db/cdb/files/cdb-0.75-stdint.diff | 85 ++++++++++++++---------------------
3 files changed, 48 insertions(+), 61 deletions(-)
diff --git a/dev-db/cdb/cdb-0.75-r4.ebuild b/dev-db/cdb/cdb-0.75-r4.ebuild
index 70faa97030d..a2dd2c71b29 100644
--- a/dev-db/cdb/cdb-0.75-r4.ebuild
+++ b/dev-db/cdb/cdb-0.75-r4.ebuild
@@ -1,9 +1,9 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
-inherit epatch multilib toolchain-funcs
+inherit toolchain-funcs
DESCRIPTION="Fast, reliable, simple package for creating and reading constant databases"
HOMEPAGE="http://cr.yp.to/cdb.html"
@@ -16,18 +16,22 @@ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~am
DEPEND="!dev-db/tinycdb"
RDEPEND="${DEPEND}"
+PATCHES=(
+ "${FILESDIR}"/${P}-errno.diff
+ "${FILESDIR}"/${P}-stdint.diff
+)
+
src_prepare() {
- epatch "${FILESDIR}"/${P}-errno.diff
- epatch "${FILESDIR}"/${P}-stdint.diff
+ default
sed -i -e 's/head -1/head -n 1/g' Makefile \
|| die "sed Makefile failed"
}
src_configure() {
- echo "$(tc-getCC) ${CFLAGS} -fPIC" > conf-cc
- echo "$(tc-getCC) ${LDFLAGS}" > conf-ld
- echo "${EPREFIX}/usr" > conf-home
+ echo "$(tc-getCC) ${CFLAGS} -fPIC" > conf-cc || die
+ echo "$(tc-getCC) ${LDFLAGS}" > conf-ld || die
+ echo "${EPREFIX}/usr" > conf-home || die
}
src_install() {
@@ -35,7 +39,7 @@ src_install() {
# ok so ... first off, some automakes fail at finding
# cdb.a, so install that now
- dolib *.a
+ dolib.a *.a
# then do this pretty little symlinking to solve the somewhat
# cosmetic library issue at hand
diff --git a/dev-db/cdb/files/cdb-0.75-errno.diff b/dev-db/cdb/files/cdb-0.75-errno.diff
index 5f6ac20c59c..e037ded7aac 100644
--- a/dev-db/cdb/files/cdb-0.75-errno.diff
+++ b/dev-db/cdb/files/cdb-0.75-errno.diff
@@ -1,5 +1,5 @@
---- error.h.orig 2003-03-29 04:18:26.000000000 -0800
-+++ error.h 2003-03-29 04:19:00.000000000 -0800
+--- a/error.h
++++ b/error.h
@@ -1,7 +1,7 @@
#ifndef ERROR_H
#define ERROR_H
diff --git a/dev-db/cdb/files/cdb-0.75-stdint.diff b/dev-db/cdb/files/cdb-0.75-stdint.diff
index eb564512075..1775fd84f90 100644
--- a/dev-db/cdb/files/cdb-0.75-stdint.diff
+++ b/dev-db/cdb/files/cdb-0.75-stdint.diff
@@ -1,6 +1,5 @@
-diff -Naur cdb-0.75-orig/cdb.c cdb-0.75/cdb.c
---- cdb-0.75-orig/cdb.c 2009-01-16 19:38:41.000000000 +0100
-+++ cdb-0.75/cdb.c 2009-01-16 19:46:17.000000000 +0100
+--- a/cdb.c
++++ b/cdb.c
@@ -41,7 +41,7 @@
}
}
@@ -30,9 +29,8 @@ diff -Naur cdb-0.75-orig/cdb.c cdb-0.75/cdb.c
if (!c->loop) {
u = cdb_hash(key,len);
-diff -Naur cdb-0.75-orig/cdbdump.c cdb-0.75/cdbdump.c
---- cdb-0.75-orig/cdbdump.c 2009-01-16 19:38:41.000000000 +0100
-+++ cdb-0.75/cdbdump.c 2009-01-16 19:46:17.000000000 +0100
+--- a/cdbdump.c
++++ b/cdbdump.c
@@ -18,7 +18,7 @@
if (buffer_flush(buffer_1) == -1) die_write();
}
@@ -73,9 +71,8 @@ diff -Naur cdb-0.75-orig/cdbdump.c cdb-0.75/cdbdump.c
getnum(&eod);
while (pos < 2048) getnum(&dlen);
-diff -Naur cdb-0.75-orig/cdbget.c cdb-0.75/cdbget.c
---- cdb-0.75-orig/cdbget.c 2009-01-16 19:38:41.000000000 +0100
-+++ cdb-0.75/cdbget.c 2009-01-16 19:46:17.000000000 +0100
+--- a/cdbget.c
++++ b/cdbget.c
@@ -27,8 +27,8 @@
{
char *key;
@@ -87,9 +84,8 @@ diff -Naur cdb-0.75-orig/cdbget.c cdb-0.75/cdbget.c
unsigned long u = 0;
if (!*argv) die_usage();
-diff -Naur cdb-0.75-orig/cdb.h cdb-0.75/cdb.h
---- cdb-0.75-orig/cdb.h 2009-01-16 19:38:41.000000000 +0100
-+++ cdb-0.75/cdb.h 2009-01-16 19:46:17.000000000 +0100
+--- a/cdb.h
++++ b/cdb.h
@@ -6,26 +6,26 @@
#include "uint32.h"
@@ -128,9 +124,8 @@ diff -Naur cdb-0.75-orig/cdb.h cdb-0.75/cdb.h
extern void cdb_findstart(struct cdb *);
extern int cdb_findnext(struct cdb *,char *,unsigned int);
-diff -Naur cdb-0.75-orig/cdb_hash.c cdb-0.75/cdb_hash.c
---- cdb-0.75-orig/cdb_hash.c 2009-01-16 19:38:41.000000000 +0100
-+++ cdb-0.75/cdb_hash.c 2009-01-16 19:46:17.000000000 +0100
+--- a/cdb_hash.c
++++ b/cdb_hash.c
@@ -2,15 +2,15 @@
#include "cdb.h"
@@ -150,9 +145,8 @@ diff -Naur cdb-0.75-orig/cdb_hash.c cdb-0.75/cdb_hash.c
h = CDB_HASHSTART;
while (len) {
-diff -Naur cdb-0.75-orig/cdb_make.c cdb-0.75/cdb_make.c
---- cdb-0.75-orig/cdb_make.c 2009-01-16 19:38:41.000000000 +0100
-+++ cdb-0.75/cdb_make.c 2009-01-16 19:51:05.000000000 +0100
+--- a/cdb_make.c
++++ b/cdb_make.c
@@ -19,15 +19,15 @@
return seek_set(fd,c->pos);
}
@@ -198,9 +192,8 @@ diff -Naur cdb-0.75-orig/cdb_make.c cdb-0.75/cdb_make.c
u /= sizeof(struct cdb_hp);
if (memsize > u) { errno = error_nomem; return -1; }
-diff -Naur cdb-0.75-orig/cdbmake.c cdb-0.75/cdbmake.c
---- cdb-0.75-orig/cdbmake.c 2009-01-16 19:38:41.000000000 +0100
-+++ cdb-0.75/cdbmake.c 2009-01-16 19:46:17.000000000 +0100
+--- a/cdbmake.c
++++ b/cdbmake.c
@@ -41,7 +41,7 @@
unsigned int klen;
unsigned int dlen;
@@ -210,9 +203,8 @@ diff -Naur cdb-0.75-orig/cdbmake.c cdb-0.75/cdbmake.c
int fd;
char ch;
-diff -Naur cdb-0.75-orig/cdb_make.h cdb-0.75/cdb_make.h
---- cdb-0.75-orig/cdb_make.h 2009-01-16 19:38:41.000000000 +0100
-+++ cdb-0.75/cdb_make.h 2009-01-16 19:46:17.000000000 +0100
+--- a/cdb_make.h
++++ b/cdb_make.h
@@ -8,7 +8,7 @@
#define CDB_HPLIST 1000
@@ -248,9 +240,8 @@ diff -Naur cdb-0.75-orig/cdb_make.h cdb-0.75/cdb_make.h
extern int cdb_make_add(struct cdb_make *,char *,unsigned int,char *,unsigned int);
extern int cdb_make_finish(struct cdb_make *);
-diff -Naur cdb-0.75-orig/cdbstats.c cdb-0.75/cdbstats.c
---- cdb-0.75-orig/cdbstats.c 2009-01-16 19:38:41.000000000 +0100
-+++ cdb-0.75/cdbstats.c 2009-01-16 19:46:17.000000000 +0100
+--- a/cdbstats.c
++++ b/cdbstats.c
@@ -28,7 +28,7 @@
if (buffer_flush(buffer_1small) == -1) die_write();
}
@@ -282,9 +273,8 @@ diff -Naur cdb-0.75-orig/cdbstats.c cdb-0.75/cdbstats.c
seek_pos rest;
int r;
-diff -Naur cdb-0.75-orig/cdbtest.c cdb-0.75/cdbtest.c
---- cdb-0.75-orig/cdbtest.c 2009-01-16 19:38:41.000000000 +0100
-+++ cdb-0.75/cdbtest.c 2009-01-16 19:46:17.000000000 +0100
+--- a/cdbtest.c
++++ b/cdbtest.c
@@ -24,7 +24,7 @@
if (buffer_flush(buffer_1small) == -1) die_write();
}
@@ -316,9 +306,8 @@ diff -Naur cdb-0.75-orig/cdbtest.c cdb-0.75/cdbtest.c
seek_pos rest;
int r;
-diff -Naur cdb-0.75-orig/Makefile cdb-0.75/Makefile
---- cdb-0.75-orig/Makefile 2009-01-16 19:38:41.000000000 +0100
-+++ cdb-0.75/Makefile 2009-01-16 19:46:17.000000000 +0100
+--- a/Makefile
++++ b/Makefile
@@ -298,13 +298,6 @@
uint32.h
./compile testzero.c
@@ -333,9 +322,8 @@ diff -Naur cdb-0.75-orig/Makefile cdb-0.75/Makefile
uint32_pack.o: \
compile uint32_pack.c uint32.h
./compile uint32_pack.c
-diff -Naur cdb-0.75-orig/TARGETS cdb-0.75/TARGETS
---- cdb-0.75-orig/TARGETS 2009-01-16 19:38:41.000000000 +0100
-+++ cdb-0.75/TARGETS 2009-01-16 19:52:06.000000000 +0100
+--- a/TARGETS
++++ b/TARGETS
@@ -1,6 +1,5 @@
load
compile
@@ -343,9 +331,8 @@ diff -Naur cdb-0.75-orig/TARGETS cdb-0.75/TARGETS
cdbget.o
systype
makelib
-diff -Naur cdb-0.75-orig/uint32.h cdb-0.75/uint32.h
---- cdb-0.75-orig/uint32.h 1970-01-01 01:00:00.000000000 +0100
-+++ cdb-0.75/uint32.h 2009-01-16 19:46:17.000000000 +0100
+--- a/uint32.h
++++ b/uint32.h
@@ -0,0 +1,11 @@
+#ifndef UINT32_H
+#define UINT32_H
@@ -358,9 +345,8 @@ diff -Naur cdb-0.75-orig/uint32.h cdb-0.75/uint32.h
+extern void uint32_unpack_big(char *,uint32_t *);
+
+#endif
-diff -Naur cdb-0.75-orig/uint32.h1 cdb-0.75/uint32.h1
---- cdb-0.75-orig/uint32.h1 2009-01-16 19:38:41.000000000 +0100
-+++ cdb-0.75/uint32.h1 1970-01-01 01:00:00.000000000 +0100
+--- a/uint32.h1
++++ b/uint32.h1
@@ -1,11 +0,0 @@
-#ifndef UINT32_H
-#define UINT32_H
@@ -373,9 +359,8 @@ diff -Naur cdb-0.75-orig/uint32.h1 cdb-0.75/uint32.h1
-extern void uint32_unpack_big(char *,uint32 *);
-
-#endif
-diff -Naur cdb-0.75-orig/uint32.h2 cdb-0.75/uint32.h2
---- cdb-0.75-orig/uint32.h2 2009-01-16 19:38:41.000000000 +0100
-+++ cdb-0.75/uint32.h2 1970-01-01 01:00:00.000000000 +0100
+--- a/uint32.h2
++++ b/uint32.h2
@@ -1,11 +0,0 @@
-#ifndef UINT32_H
-#define UINT32_H
@@ -388,9 +373,8 @@ diff -Naur cdb-0.75-orig/uint32.h2 cdb-0.75/uint32.h2
-extern void uint32_unpack_big(char *,uint32 *);
-
-#endif
-diff -Naur cdb-0.75-orig/uint32_pack.c cdb-0.75/uint32_pack.c
---- cdb-0.75-orig/uint32_pack.c 2009-01-16 19:38:41.000000000 +0100
-+++ cdb-0.75/uint32_pack.c 2009-01-16 19:46:17.000000000 +0100
+--- a/uint32_pack.c
++++ b/uint32_pack.c
@@ -1,6 +1,6 @@
#include "uint32.h"
@@ -408,9 +392,8 @@ diff -Naur cdb-0.75-orig/uint32_pack.c cdb-0.75/uint32_pack.c
{
s[3] = u & 255;
u >>= 8;
-diff -Naur cdb-0.75-orig/uint32_unpack.c cdb-0.75/uint32_unpack.c
---- cdb-0.75-orig/uint32_unpack.c 2009-01-16 19:38:41.000000000 +0100
-+++ cdb-0.75/uint32_unpack.c 2009-01-16 19:46:17.000000000 +0100
+--- a/uint32_unpack.c
++++ b/uint32_unpack.c
@@ -1,8 +1,8 @@
#include "uint32.h"
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-db/cdb/, dev-db/cdb/files/
@ 2021-11-10 13:46 Akinori Hattori
0 siblings, 0 replies; 3+ messages in thread
From: Akinori Hattori @ 2021-11-10 13:46 UTC (permalink / raw
To: gentoo-commits
commit: 58d46a271f1bfbe0965971bae534c805bef0e244
Author: Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 10 13:40:47 2021 +0000
Commit: Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Wed Nov 10 13:40:47 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=58d46a27
dev-db/cdb: fix build
Closes: https://bugs.gentoo.org/693094
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Akinori Hattori <hattya <AT> gentoo.org>
dev-db/cdb/cdb-0.75-r4.ebuild | 1 +
dev-db/cdb/files/cdb-inline.patch | 11 +++++++++++
2 files changed, 12 insertions(+)
diff --git a/dev-db/cdb/cdb-0.75-r4.ebuild b/dev-db/cdb/cdb-0.75-r4.ebuild
index ff5d1a6ffa7..23009ad748e 100644
--- a/dev-db/cdb/cdb-0.75-r4.ebuild
+++ b/dev-db/cdb/cdb-0.75-r4.ebuild
@@ -18,6 +18,7 @@ RDEPEND="${DEPEND}"
PATCHES=(
"${FILESDIR}"/${PN}-errno.patch
+ "${FILESDIR}"/${PN}-inline.patch
"${FILESDIR}"/${PN}-stdint.patch
)
diff --git a/dev-db/cdb/files/cdb-inline.patch b/dev-db/cdb/files/cdb-inline.patch
new file mode 100644
index 00000000000..2d297dc62a4
--- /dev/null
+++ b/dev-db/cdb/files/cdb-inline.patch
@@ -0,0 +1,11 @@
+--- a/cdbmake.c
++++ b/cdbmake.c
+@@ -26,7 +26,7 @@
+ strerr_die2x(111,FATAL,"unable to read input: bad format");
+ }
+
+-inline void get(char *ch)
++static inline void get(char *ch)
+ {
+ switch(buffer_GETC(buffer_0,ch)) {
+ case 0: die_readformat();
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-db/cdb/, dev-db/cdb/files/
@ 2024-11-26 22:42 Sam James
0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2024-11-26 22:42 UTC (permalink / raw
To: gentoo-commits
commit: 3912817bfaff968118c02bada3730473ad27fc62
Author: NHOrus <jy6x2b32pie9 <AT> yahoo <DOT> com>
AuthorDate: Fri Jun 28 10:01:08 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Nov 26 22:41:56 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3912817b
dev-db/cdb: Port to C99
Main patch is from bug 874963
Closes: https://bugs.gentoo.org/874963
Closes: https://bugs.gentoo.org/894714
Signed-off-by: NHOrus <jy6x2b32pie9 <AT> yahoo.com>
Closes: https://github.com/gentoo/gentoo/pull/34204
Closes: https://github.com/gentoo/gentoo/pull/37334
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-db/cdb/cdb-0.75-r5.ebuild | 61 +++++
dev-db/cdb/files/cdb-C99.patch | 482 +++++++++++++++++++++++++++++++++++
dev-db/cdb/files/cdb-make-type.patch | 119 +++++++++
3 files changed, 662 insertions(+)
diff --git a/dev-db/cdb/cdb-0.75-r5.ebuild b/dev-db/cdb/cdb-0.75-r5.ebuild
new file mode 100644
index 000000000000..9f325d3de33c
--- /dev/null
+++ b/dev-db/cdb/cdb-0.75-r5.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+inherit toolchain-funcs
+
+DESCRIPTION="Fast, reliable, simple package for creating and reading constant databases"
+HOMEPAGE="https://cr.yp.to/cdb.html"
+SRC_URI="https://cr.yp.to/${PN}/${P}.tar.gz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE=""
+
+RDEPEND="!dev-db/tinycdb"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-errno.patch
+ "${FILESDIR}"/${PN}-inline.patch
+ "${FILESDIR}"/${PN}-stdint.patch
+ "${FILESDIR}"/${PN}-C99.patch
+ "${FILESDIR}"/${PN}-make-type.patch
+)
+DOCS=( CHANGES README TODO VERSION )
+
+src_prepare() {
+ default
+
+ sed -i \
+ -e "s/head -1/head -n 1/g" \
+ -e "s/ar /$(tc-getAR) /" \
+ -e "s/ranlib /$(tc-getRANLIB) /" \
+ Makefile
+}
+
+src_configure() {
+ echo "$(tc-getCC) ${CFLAGS} -fPIC" >conf-cc || die
+ echo "$(tc-getCC) ${LDFLAGS}" >conf-ld || die
+ echo "${EPREFIX}/usr" >conf-home || die
+}
+
+src_install() {
+ dobin ${PN}{dump,get,make{,-12,-sv},stats,test}
+
+ # ok so ... first off, some automakes fail at finding
+ # cdb.a, so install that now
+ dolib.a *.a
+ # then do this pretty little symlinking to solve the somewhat
+ # cosmetic library issue at hand
+ dosym ${PN}.a /usr/$(get_libdir)/lib${PN}.a
+
+ # uint32.h needs installation too, otherwise compiles depending
+ # on it will fail
+ insinto /usr/include/${PN}
+ doins ${PN}*.h {alloc,buffer,uint32}.h
+
+ einstalldocs
+}
diff --git a/dev-db/cdb/files/cdb-C99.patch b/dev-db/cdb/files/cdb-C99.patch
new file mode 100644
index 000000000000..8e201904ad52
--- /dev/null
+++ b/dev-db/cdb/files/cdb-C99.patch
@@ -0,0 +1,482 @@
+Patch by Vladislav Dudar from https://bugs.gentoo.org/874963
+diff -Naur a/alloc.c b/alloc.c
+--- a/alloc.c 2024-03-02 22:40:29.336632203 +0300
++++ b/alloc.c 2024-03-02 22:44:54.890055799 +0300
+@@ -1,7 +1,6 @@
++#include <stdlib.h>
+ #include "alloc.h"
+ #include "error.h"
+-extern char *malloc();
+-extern void free();
+
+ #define ALIGNMENT 16 /* XXX: assuming that this alignment is enough */
+ #define SPACE 4096 /* must be multiple of ALIGNMENT */
+diff -Naur a/auto-str.c b/auto-str.c
+--- a/auto-str.c 2024-03-02 22:40:29.336632203 +0300
++++ b/auto-str.c 2024-03-02 22:44:23.263775501 +0300
+@@ -1,17 +1,17 @@
++#include <stdio.h>
+ #include "buffer.h"
+-#include "readwrite.h"
+ #include "exit.h"
+
+ char buf1[256];
+ buffer ss1 = BUFFER_INIT(write,1,buf1,sizeof(buf1));
+
+-void puts(s)
++void puts_djb(s)
+ char *s;
+ {
+ if (buffer_puts(&ss1,s) == -1) _exit(111);
+ }
+
+-main(argc,argv)
++void main(argc,argv)
+ int argc;
+ char **argv;
+ {
+@@ -25,20 +25,20 @@
+ value = argv[2];
+ if (!value) _exit(100);
+
+- puts("char ");
+- puts(name);
+- puts("[] = \"\\\n");
++ puts_djb("char ");
++ puts_djb(name);
++ puts_djb("[] = \"\\\n");
+
+ while (ch = *value++) {
+- puts("\\");
++ puts_djb("\\");
+ octal[3] = 0;
+ octal[2] = '0' + (ch & 7); ch >>= 3;
+ octal[1] = '0' + (ch & 7); ch >>= 3;
+ octal[0] = '0' + (ch & 7);
+- puts(octal);
++ puts_djb(octal);
+ }
+
+- puts("\\\n\";\n");
++ puts_djb("\\\n\";\n");
+ if (buffer_flush(&ss1) == -1) _exit(111);
+ _exit(0);
+ }
+diff -Naur a/buffer_0.c b/buffer_0.c
+--- a/buffer_0.c 2024-03-02 22:40:29.336632203 +0300
++++ b/buffer_0.c 2024-03-02 22:44:23.267108794 +0300
+@@ -1,4 +1,3 @@
+-#include "readwrite.h"
+ #include "buffer.h"
+
+ int buffer_0_read(fd,buf,len) int fd; char *buf; int len;
+diff -Naur a/buffer_1.c b/buffer_1.c
+--- a/buffer_1.c 2024-03-02 22:40:29.336632203 +0300
++++ b/buffer_1.c 2024-03-02 22:44:23.267108794 +0300
+@@ -1,4 +1,3 @@
+-#include "readwrite.h"
+ #include "buffer.h"
+
+ char buffer_1_space[BUFFER_OUTSIZE];
+diff -Naur a/buffer_1s.c b/buffer_1s.c
+--- a/buffer_1s.c 2024-03-02 22:40:29.336632203 +0300
++++ b/buffer_1s.c 2024-03-02 22:44:23.280441964 +0300
+@@ -1,4 +1,3 @@
+-#include "readwrite.h"
+ #include "buffer.h"
+
+ char buffer_1small_space[256];
+diff -Naur a/buffer_2.c b/buffer_2.c
+--- a/buffer_2.c 2024-03-02 22:40:29.336632203 +0300
++++ b/buffer_2.c 2024-03-02 22:44:23.280441964 +0300
+@@ -1,4 +1,3 @@
+-#include "readwrite.h"
+ #include "buffer.h"
+
+ char buffer_2_space[256];
+diff -Naur a/buffer.c b/buffer.c
+--- a/buffer.c 2024-03-02 22:40:29.336632203 +0300
++++ b/buffer.c 2024-03-02 22:44:23.280441964 +0300
+@@ -1,6 +1,6 @@
+ #include "buffer.h"
+
+-void buffer_init(buffer *s,int (*op)(),int fd,char *buf,unsigned int len)
++void buffer_init(buffer *s,ssize_t (*op)(),int fd,char *buf,unsigned int len)
+ {
+ s->x = buf;
+ s->fd = fd;
+diff -Naur a/buffer_get.c b/buffer_get.c
+--- a/buffer_get.c 2024-03-02 22:40:29.336632203 +0300
++++ b/buffer_get.c 2024-03-02 22:44:23.280441964 +0300
+@@ -2,9 +2,9 @@
+ #include "byte.h"
+ #include "error.h"
+
+-static int oneread(int (*op)(),int fd,char *buf,unsigned int len)
++static int oneread(long int (*op)(),int fd,char *buf,unsigned int len)
+ {
+- int r;
++ long int r;
+
+ for (;;) {
+ r = op(fd,buf,len);
+diff -Naur a/buffer.h b/buffer.h
+--- a/buffer.h 2024-03-02 22:40:29.336632203 +0300
++++ b/buffer.h 2024-03-02 22:44:23.280441964 +0300
+@@ -1,19 +1,21 @@
+ #ifndef BUFFER_H
+ #define BUFFER_H
+
++#include <unistd.h>
++
+ typedef struct buffer {
+ char *x;
+ unsigned int p;
+ unsigned int n;
+ int fd;
+- int (*op)();
++ ssize_t (*op)();
+ } buffer;
+
+-#define BUFFER_INIT(op,fd,buf,len) { (buf), 0, (len), (fd), (op) }
++#define BUFFER_INIT(op,fd,buf,len) { (buf), 0, (len), (fd), (long(*)())(op) }
+ #define BUFFER_INSIZE 8192
+ #define BUFFER_OUTSIZE 8192
+
+-extern void buffer_init(buffer *,int (*)(),int,char *,unsigned int);
++extern void buffer_init(buffer *,ssize_t (*)(),int,char *,unsigned int);
+
+ extern int buffer_flush(buffer *);
+ extern int buffer_put(buffer *,char *,unsigned int);
+diff -Naur a/buffer_put.c b/buffer_put.c
+--- a/buffer_put.c 2024-03-02 22:40:29.336632203 +0300
++++ b/buffer_put.c 2024-03-02 22:44:23.280441964 +0300
+@@ -3,9 +3,9 @@
+ #include "byte.h"
+ #include "error.h"
+
+-static int allwrite(int (*op)(),int fd,char *buf,unsigned int len)
++static int allwrite(long int (*op)(),int fd,char *buf,unsigned int len)
+ {
+- int w;
++ long int w;
+
+ while (len) {
+ w = op(fd,buf,len);
+diff -Naur a/cdb.c b/cdb.c
+--- a/cdb.c 2024-03-02 22:40:29.333298910 +0300
++++ b/cdb.c 2024-03-02 22:44:23.280441964 +0300
+@@ -3,7 +3,6 @@
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <sys/mman.h>
+-#include "readwrite.h"
+ #include "error.h"
+ #include "seek.h"
+ #include "byte.h"
+diff -Naur a/cdbdump.c b/cdbdump.c
+--- a/cdbdump.c 2024-03-02 22:40:29.333298910 +0300
++++ b/cdbdump.c 2024-03-02 22:44:23.280441964 +0300
+@@ -58,7 +58,7 @@
+
+ char strnum[FMT_ULONG];
+
+-main()
++void main()
+ {
+ uint32 eod;
+ uint32 klen;
+diff -Naur a/cdbget.c b/cdbget.c
+--- a/cdbget.c 2024-03-02 22:40:29.333298910 +0300
++++ b/cdbget.c 2024-03-02 22:44:23.280441964 +0300
+@@ -23,7 +23,7 @@
+ static struct cdb c;
+ char buf[1024];
+
+-main(int argc,char **argv)
++void main(int argc,char **argv)
+ {
+ char *key;
+ int r;
+diff -Naur a/cdb.h b/cdb.h
+--- a/cdb.h 2024-03-02 22:40:29.333298910 +0300
++++ b/cdb.h 2024-03-02 22:44:23.280441964 +0300
+@@ -3,6 +3,7 @@
+ #ifndef CDB_H
+ #define CDB_H
+
++#include <unistd.h>
+ #include "uint32.h"
+
+ #define CDB_HASHSTART 5381
+diff -Naur a/cdb_make.c b/cdb_make.c
+--- a/cdb_make.c 2024-03-02 22:40:29.333298910 +0300
++++ b/cdb_make.c 2024-03-02 22:44:23.283775257 +0300
+@@ -1,6 +1,5 @@
+ /* Public domain. */
+
+-#include "readwrite.h"
+ #include "seek.h"
+ #include "error.h"
+ #include "alloc.h"
+diff -Naur a/cdbmake.c b/cdbmake.c
+--- a/cdbmake.c 2024-03-02 22:40:29.333298910 +0300
++++ b/cdbmake.c 2024-03-02 22:44:23.283775257 +0300
+@@ -36,7 +36,7 @@
+
+ static struct cdb_make c;
+
+-main(int argc,char **argv)
++void main(int argc,char **argv)
+ {
+ unsigned int klen;
+ unsigned int dlen;
+diff -Naur a/cdb_make.h b/cdb_make.h
+--- a/cdb_make.h 2024-03-02 22:40:29.333298910 +0300
++++ b/cdb_make.h 2024-03-02 22:44:23.283775257 +0300
+@@ -3,6 +3,7 @@
+ #ifndef CDB_MAKE_H
+ #define CDB_MAKE_H
+
++#include <stdio.h>
+ #include "buffer.h"
+ #include "uint32.h"
+
+diff -Naur a/cdbstats.c b/cdbstats.c
+--- a/cdbstats.c 2024-03-02 22:40:29.333298910 +0300
++++ b/cdbstats.c 2024-03-02 22:44:23.283775257 +0300
+@@ -3,6 +3,7 @@
+ #include "buffer.h"
+ #include "strerr.h"
+ #include "seek.h"
++#include "str.h"
+ #include "cdb.h"
+
+ #define FATAL "cdbstats: fatal: "
+@@ -68,7 +69,7 @@
+ static unsigned long numrecords;
+ static unsigned long numd[11];
+
+-main()
++void main()
+ {
+ uint32 eod;
+ uint32 klen;
+diff -Naur a/cdbtest.c b/cdbtest.c
+--- a/cdbtest.c 2024-03-02 22:40:29.333298910 +0300
++++ b/cdbtest.c 2024-03-02 22:44:23.283775257 +0300
+@@ -3,6 +3,7 @@
+ #include "buffer.h"
+ #include "strerr.h"
+ #include "seek.h"
++#include "str.h"
+ #include "cdb.h"
+
+ #define FATAL "cdbtest: fatal: "
+@@ -66,7 +67,7 @@
+
+ static struct cdb c;
+
+-main()
++void main()
+ {
+ uint32 eod;
+ uint32 klen;
+diff -Naur a/FILES b/FILES
+--- a/FILES 2024-03-02 22:40:29.333298910 +0300
++++ b/FILES 2024-03-02 22:44:23.283775257 +0300
+@@ -55,12 +55,12 @@
+ fmt.h
+ fmt_ulong.c
+ hier.c
++hier.h
+ install.c
+ instcheck.c
+ open.h
+ open_read.c
+ open_trunc.c
+-readwrite.h
+ scan.h
+ scan_ulong.c
+ seek.h
+diff -Naur a/hier.c b/hier.c
+--- a/hier.c 2024-03-02 22:40:29.336632203 +0300
++++ b/hier.c 2024-03-02 22:44:23.283775257 +0300
+@@ -1,4 +1,5 @@
+ #include "auto_home.h"
++#include "hier.h"
+
+ void hier()
+ {
+diff -Naur a/hier.h b/hier.h
+--- a/hier.h 1970-01-01 03:00:00.000000000 +0300
++++ b/hier.h 2024-03-02 22:44:23.283775257 +0300
+@@ -0,0 +1,8 @@
++#ifndef HIER_H
++#define HIER_H
++
++void h(char *home,int uid,int gid,int mode);
++void d(char *home,char *subdir,int uid,int gid,int mode);
++void c(char *home,char *subdir,char *file,int uid,int gid,int mode);
++
++#endif
+diff -Naur a/install.c b/install.c
+--- a/install.c 2024-03-02 22:40:29.336632203 +0300
++++ b/install.c 2024-03-02 22:44:23.283775257 +0300
+@@ -1,8 +1,8 @@
++#include <sys/stat.h>
+ #include "buffer.h"
+ #include "strerr.h"
+ #include "error.h"
+ #include "open.h"
+-#include "readwrite.h"
+ #include "exit.h"
+
+ extern void hier();
+@@ -137,7 +137,7 @@
+ strerr_die6sys(111,FATAL,"unable to chmod .../",subdir,"/",file,": ");
+ }
+
+-main()
++void main()
+ {
+ fdsourcedir = open_read(".");
+ if (fdsourcedir == -1)
+diff -Naur a/instcheck.c b/instcheck.c
+--- a/instcheck.c 2024-03-02 22:40:29.336632203 +0300
++++ b/instcheck.c 2024-03-02 22:44:23.283775257 +0300
+@@ -1,8 +1,8 @@
+ #include <sys/types.h>
+ #include <sys/stat.h>
++#include <unistd.h>
+ #include "strerr.h"
+ #include "error.h"
+-#include "readwrite.h"
+ #include "exit.h"
+
+ extern void hier();
+@@ -101,7 +101,7 @@
+ perm("",home,"/",file,S_IFREG,uid,gid,mode);
+ }
+
+-main()
++void main()
+ {
+ hier();
+ _exit(0);
+diff -Naur a/Makefile b/Makefile
+--- a/Makefile 2024-03-02 22:40:29.333298910 +0300
++++ b/Makefile 2024-03-02 22:44:23.300441719 +0300
+@@ -17,7 +17,7 @@
+ ./load auto-str buffer.a unix.a byte.a
+
+ auto-str.o: \
+-compile auto-str.c buffer.h readwrite.h exit.h
++compile auto-str.c buffer.h exit.h
+ ./compile auto-str.c
+
+ auto_home.c: \
+@@ -40,19 +40,19 @@
+ ./compile buffer.c
+
+ buffer_0.o: \
+-compile buffer_0.c readwrite.h buffer.h
++compile buffer_0.c buffer.h
+ ./compile buffer_0.c
+
+ buffer_1.o: \
+-compile buffer_1.c readwrite.h buffer.h
++compile buffer_1.c buffer.h
+ ./compile buffer_1.c
+
+ buffer_1s.o: \
+-compile buffer_1s.c readwrite.h buffer.h
++compile buffer_1s.c buffer.h
+ ./compile buffer_1s.c
+
+ buffer_2.o: \
+-compile buffer_2.c readwrite.h buffer.h
++compile buffer_2.c buffer.h
+ ./compile buffer_2.c
+
+ buffer_copy.o: \
+@@ -91,7 +91,7 @@
+ ./makelib cdb.a cdb.o cdb_hash.o cdb_make.o
+
+ cdb.o: \
+-compile cdb.c readwrite.h error.h seek.h byte.h cdb.h uint32.h
++compile cdb.c error.h seek.h byte.h cdb.h uint32.h
+ ./compile cdb.c
+
+ cdb_hash.o: \
+@@ -99,7 +99,7 @@
+ ./compile cdb_hash.c
+
+ cdb_make.o: \
+-compile cdb_make.c readwrite.h seek.h error.h alloc.h cdb.h uint32.h \
++compile cdb_make.c seek.h error.h alloc.h cdb.h uint32.h \
+ cdb_make.h buffer.h uint32.h
+ ./compile cdb_make.c
+
+@@ -184,7 +184,7 @@
+ ./compile fmt_ulong.c
+
+ hier.o: \
+-compile hier.c auto_home.h
++compile hier.c hier.h auto_home.h
+ ./compile hier.c
+
+ install: \
+@@ -192,7 +192,7 @@
+ ./load install hier.o auto_home.o buffer.a unix.a byte.a
+
+ install.o: \
+-compile install.c buffer.h strerr.h error.h open.h readwrite.h exit.h
++compile install.c buffer.h strerr.h error.h open.h exit.h
+ ./compile install.c
+
+ instcheck: \
+@@ -200,7 +200,7 @@
+ ./load instcheck hier.o auto_home.o buffer.a unix.a byte.a
+
+ instcheck.o: \
+-compile instcheck.c strerr.h error.h readwrite.h exit.h
++compile instcheck.c strerr.h error.h exit.h
+ ./compile instcheck.c
+
+ it: \
+diff -Naur a/readwrite.h b/readwrite.h
+--- a/readwrite.h 2024-03-02 22:40:29.336632203 +0300
++++ b/readwrite.h 1970-01-01 03:00:00.000000000 +0300
+@@ -1,7 +0,0 @@
+-#ifndef READWRITE_H
+-#define READWRITE_H
+-
+-extern int read();
+-extern int write();
+-
+-#endif
+diff -Naur a/seek.h b/seek.h
+--- a/seek.h 2024-03-02 22:40:29.336632203 +0300
++++ b/seek.h 2024-03-02 22:44:23.300441719 +0300
+@@ -1,6 +1,8 @@
+ #ifndef SEEK_H
+ #define SEEK_H
+
++#include <unistd.h>
++
+ typedef unsigned long seek_pos;
+
+ extern seek_pos seek_cur(int);
+diff -Naur a/testzero.c b/testzero.c
+--- a/testzero.c 2024-03-02 22:40:29.333298910 +0300
++++ b/testzero.c 2024-03-02 22:44:23.300441719 +0300
+@@ -14,7 +14,7 @@
+ static char data[65536];
+ struct cdb_make c;
+
+-main(int argc,char **argv)
++void main(int argc,char **argv)
+ {
+ int fd;
+ unsigned long loop;
diff --git a/dev-db/cdb/files/cdb-make-type.patch b/dev-db/cdb/files/cdb-make-type.patch
new file mode 100644
index 000000000000..574c62851fb8
--- /dev/null
+++ b/dev-db/cdb/files/cdb-make-type.patch
@@ -0,0 +1,119 @@
+fixes all warnings below, because they annoyed me
+return type of 'main' is not 'int' [-Wmain-return-type]
+diff '--color=auto' -ru a/auto-str.c b/auto-str.c
+--- a/auto-str.c 2024-06-28 09:58:21.705876043 -0000
++++ b/auto-str.c 2024-06-28 09:58:28.913833538 -0000
+@@ -11,7 +11,7 @@
+ if (buffer_puts(&ss1,s) == -1) _exit(111);
+ }
+
+-void main(argc,argv)
++int main(argc,argv)
+ int argc;
+ char **argv;
+ {
+diff '--color=auto' -ru a/cdbdump.c b/cdbdump.c
+--- a/cdbdump.c 2024-06-28 09:58:21.706876037 -0000
++++ b/cdbdump.c 2024-06-28 09:58:28.901833608 -0000
+@@ -58,7 +58,7 @@
+
+ char strnum[FMT_ULONG];
+
+-void main()
++int main()
+ {
+ uint32_t eod;
+ uint32_t klen;
+diff '--color=auto' -ru a/cdbget.c b/cdbget.c
+--- a/cdbget.c 2024-06-28 09:58:21.711876007 -0000
++++ b/cdbget.c 2024-06-28 09:58:28.898833626 -0000
+@@ -23,7 +23,7 @@
+ static struct cdb c;
+ char buf[1024];
+
+-void main(int argc,char **argv)
++int main(int argc,char **argv)
+ {
+ char *key;
+ int r;
+diff '--color=auto' -ru a/cdbmake.c b/cdbmake.c
+--- a/cdbmake.c 2024-06-28 09:58:21.716875978 -0000
++++ b/cdbmake.c 2024-06-28 09:58:28.900833614 -0000
+@@ -36,7 +36,7 @@
+
+ static struct cdb_make c;
+
+-void main(int argc,char **argv)
++int main(int argc,char **argv)
+ {
+ unsigned int klen;
+ unsigned int dlen;
+diff '--color=auto' -ru a/cdbstats.c b/cdbstats.c
+--- a/cdbstats.c 2024-06-28 09:58:21.718875966 -0000
++++ b/cdbstats.c 2024-06-28 09:58:28.903833597 -0000
+@@ -69,7 +69,7 @@
+ static unsigned long numrecords;
+ static unsigned long numd[11];
+
+-void main()
++int main()
+ {
+ uint32_t eod;
+ uint32_t klen;
+diff '--color=auto' -ru a/cdbtest.c b/cdbtest.c
+--- a/cdbtest.c 2024-06-28 09:58:21.718875966 -0000
++++ b/cdbtest.c 2024-06-28 09:58:28.904833591 -0000
+@@ -67,7 +67,7 @@
+
+ static struct cdb c;
+
+-void main()
++int main()
+ {
+ uint32_t eod;
+ uint32_t klen;
+diff '--color=auto' -ru a/install.c b/install.c
+--- a/install.c 2024-06-28 09:58:21.719875960 -0000
++++ b/install.c 2024-06-28 09:58:28.928833449 -0000
+@@ -137,7 +137,7 @@
+ strerr_die6sys(111,FATAL,"unable to chmod .../",subdir,"/",file,": ");
+ }
+
+-void main()
++int main()
+ {
+ fdsourcedir = open_read(".");
+ if (fdsourcedir == -1)
+diff '--color=auto' -ru a/instcheck.c b/instcheck.c
+--- a/instcheck.c 2024-06-28 09:58:21.719875960 -0000
++++ b/instcheck.c 2024-06-28 09:58:28.929833443 -0000
+@@ -101,7 +101,7 @@
+ perm("",home,"/",file,S_IFREG,uid,gid,mode);
+ }
+
+-void main()
++int main()
+ {
+ hier();
+ _exit(0);
+diff '--color=auto' -ru a/testzero.c b/testzero.c
+--- a/testzero.c 2024-06-28 09:58:21.720875954 -0000
++++ b/testzero.c 2024-06-28 09:58:28.908833567 -0000
+@@ -14,7 +14,7 @@
+ static char data[65536];
+ struct cdb_make c;
+
+-void main(int argc,char **argv)
++int main(int argc,char **argv)
+ {
+ int fd;
+ unsigned long loop;
+diff '--color=auto' -ru a/tryulong32.c b/tryulong32.c
+--- a/tryulong32.c 2024-06-28 09:58:21.715875984 -0000
++++ b/tryulong32.c 2024-06-28 09:58:28.936833402 -0000
+@@ -1,4 +1,4 @@
+-void main()
++int main()
+ {
+ unsigned long u;
+ u = 1;
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-11-26 22:42 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-04-19 19:12 [gentoo-commits] repo/gentoo:master commit in: dev-db/cdb/, dev-db/cdb/files/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2021-11-10 13:46 Akinori Hattori
2024-11-26 22:42 Sam James
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox