main/djbdns: fix gcc syntax incompatible

This commit is contained in:
znley 2024-08-06 08:27:01 +00:00 committed by Natanael Copa
parent 63966902ad
commit 8d9ca97ea3
2 changed files with 74 additions and 0 deletions

View file

@ -15,6 +15,7 @@ https://www.fefe.de/dns/djbdns-1.05-test25.diff.bz2
dnstracesort.patch
djbdns-1.05-jumbo-josb.patch
implicit.patch
incompatible.patch
$pkgver-errno.patch
$pkgver-response.patch
tinydns.pre-install
@ -114,6 +115,7 @@ be4c9aea40c737364a56f188ad2276d90deac0dffb73ba4b659490836c0fe92ffb65ccf23c6724b9
ae9cd51f24041aed135b5ba88d1efd0310b8095bccd6fb60a986756b460a4f98a93e163c3ddae7c146d56a9d41778d17449f772b91fdc58d9e69523cf6c2a6e9 dnstracesort.patch
7612e79638617806425bf6e601dd797f79a0106c47a31c73c88e2504b14e8f0238bad7dc8af1fbc5b1609bfa38578c556dcba2ce9034673bd07c9bc95789ee04 djbdns-1.05-jumbo-josb.patch
b8778f8086edc5703fc0f447ad108bda2e029e612f80c39925833566ff8fa12687bb5300b1f0ee738c7180d4f8269ff88c965bef8879dc6eeea8228a598c10ce implicit.patch
b676e1b12d025168bbd170770ab2fca87f019aa9e4d3b742b0e3c62f35f3f96880449beaef544f47538bfb7bdfad7b965aee42a055ffcbd732573fb25fb4bc36 incompatible.patch
086d02600034d486f084fd2500aba9041dfa02110781594cdc3781a3ad7823f61f11c54c053c8c1241f58660527abe536906aba0e7f6c49ed3b8dbd74ba8f2b7 1.05-errno.patch
407207f8387e2344fdebe68ab2213adbd9f1e6034e343b4359c8c1fa6ce36b0878a8367e4ee05cb4a44c199d4956aef0c6c8e84ab4f5556178547346ab88b82d 1.05-response.patch
20dd227e4f1362136070d914d5ee41082b5f16ee8602ad591e52b02f03ff0531d0589fff4352fc6799a8c192b69a99af1b013f87ee4ddbdffa03715d33e2f5af tinydns.pre-install

View file

@ -0,0 +1,72 @@
diff --git a/tinydns-data.c b/tinydns-data.c
index 104ad2f..df716a8 100644
--- a/tinydns-data.c
+++ b/tinydns-data.c
@@ -254,19 +254,19 @@ int load(const char *fname)
if (!dns_domain_fromdot(&d1,f[0].s,f[0].len)) nomem();
if (!stralloc_0(&f[3])) nomem();
- if (!scan_ulong(f[3].s,&u)) uint32_unpack_big(defaultsoa,&u);
+ if (!scan_ulong(f[3].s,&u)) uint32_unpack_big(defaultsoa,(uint32 *)&u);
uint32_pack_big(soa,u);
if (!stralloc_0(&f[4])) nomem();
- if (!scan_ulong(f[4].s,&u)) uint32_unpack_big(defaultsoa + 4,&u);
+ if (!scan_ulong(f[4].s,&u)) uint32_unpack_big(defaultsoa + 4,(uint32 *)&u);
uint32_pack_big(soa + 4,u);
if (!stralloc_0(&f[5])) nomem();
- if (!scan_ulong(f[5].s,&u)) uint32_unpack_big(defaultsoa + 8,&u);
+ if (!scan_ulong(f[5].s,&u)) uint32_unpack_big(defaultsoa + 8,(uint32 *)&u);
uint32_pack_big(soa + 8,u);
if (!stralloc_0(&f[6])) nomem();
- if (!scan_ulong(f[6].s,&u)) uint32_unpack_big(defaultsoa + 12,&u);
+ if (!scan_ulong(f[6].s,&u)) uint32_unpack_big(defaultsoa + 12,(uint32 *)&u);
uint32_pack_big(soa + 12,u);
if (!stralloc_0(&f[7])) nomem();
- if (!scan_ulong(f[7].s,&u)) uint32_unpack_big(defaultsoa + 16,&u);
+ if (!scan_ulong(f[7].s,&u)) uint32_unpack_big(defaultsoa + 16,(uint32 *)&u);
uint32_pack_big(soa + 16,u);
if (!stralloc_0(&f[8])) nomem();
diff --git a/chkshsgr.c b/chkshsgr.c
index 8cfd11e..03ecb61 100644
--- a/chkshsgr.c
+++ b/chkshsgr.c
@@ -4,7 +4,7 @@
int main()
{
- short x[4];
+ int x[4]; /* #define __GID_T_TYPE __U32_TYPE */
x[0] = x[1] = 0;
if (getgroups(1,x) == 0) if (setgroups(1,x) == -1) _exit(1);
diff --git a/hier.c b/hier.c
index 4aef75b..3bc87cf 100644
--- a/hier.c
+++ b/hier.c
@@ -1,5 +1,9 @@
#include "auto_home.h"
+extern void c(char *home,char *subdir,char *file,int uid,int gid,int mode);
+extern void d(char *home,char *subdir,int uid,int gid,int mode);
+extern void h(char *home,int uid,int gid,int mode);
+
void hier()
{
c("/","etc","dnsroots.global",-1,-1,0644);
diff --git a/utime.c b/utime.c
index be6c936..5d099ec 100644
--- a/utime.c
+++ b/utime.c
@@ -20,6 +20,6 @@ int main(int argc,char **argv)
scan_ulong(ustr,&u);
ut[0] = ut[1] = u;
- if (utime(fn,ut) == -1) _exit(111);
+ if (utime(fn,(struct utimbuf *)ut) == -1) _exit(111);
_exit(0);
}