head 1.4; access; symbols OPENPKG_E1_MP_HEAD:1.4 OPENPKG_E1_MP:1.4 OPENPKG_E1_MP_2_STABLE:1.4 OPENPKG_E1_FP:1.4 OPENPKG_2_STABLE_MP:1.4 OPENPKG_2_STABLE_20061018:1.4 OPENPKG_2_STABLE_20060622:1.4 OPENPKG_2_STABLE:1.4.0.4 OPENPKG_2_STABLE_BP:1.4 OPENPKG_2_5_RELEASE:1.4 OPENPKG_2_5_SOLID:1.4.0.2 OPENPKG_2_5_SOLID_BP:1.4 OPENPKG_2_4_RELEASE:1.3 OPENPKG_2_4_SOLID:1.3.0.10 OPENPKG_2_4_SOLID_BP:1.3 OPENPKG_CW_FP:1.3 OPENPKG_2_3_RELEASE:1.3 OPENPKG_2_3_SOLID:1.3.0.8 OPENPKG_2_3_SOLID_BP:1.3 OPENPKG_2_2_RELEASE:1.3 OPENPKG_2_2_SOLID:1.3.0.6 OPENPKG_2_2_SOLID_BP:1.3 OPENPKG_2_1_RELEASE:1.3 OPENPKG_2_1_SOLID:1.3.0.4 OPENPKG_2_1_SOLID_BP:1.3 OPENPKG_2_0_RELEASE:1.3 OPENPKG_2_0_SOLID:1.3.0.2 OPENPKG_2_0_SOLID_BP:1.3; locks; strict; comment @# @; 1.4 date 2005.10.10.22.19.59; author steve; state Exp; branches; next 1.3; 1.3 date 2004.01.12.14.17.52; author thl; state Exp; branches; next 1.2; 1.2 date 2003.10.13.09.08.57; author thl; state Exp; branches; next 1.1; 1.1 date 2003.09.22.08.24.35; author ms; state Exp; branches; next ; desc @@ 1.4 log @Some fixes for gcc4 @ text @Index: doc/Makefile.in --- doc/Makefile.in.orig 2004-01-12 05:52:20 +0100 +++ doc/Makefile.in 2005-10-10 23:21:46 +0200 @@@@ -447,18 +447,18 @@@@ install-data-local: - @@if test -f $(sysconfdir)/cpu.conf ; then \ - echo "$@@ will not overwrite existing $(sysconfdir)/cpu.conf"; \ + @@if test -f $(DESTDIR)$(sysconfdir)/cpu.conf ; then \ + echo "$@@ will not overwrite existing $(DESTDIR)$(sysconfdir)/cpu.conf"; \ else \ - $(mkinstalldirs) $(sysconfdir); \ - echo "$(INSTALL_DATA) cpu.conf $(sysconfdir)/cpu.conf"; \ - $(INSTALL_DATA) cpu.conf $(sysconfdir)/cpu.conf; \ + $(mkinstalldirs) $(DESTDIR)$(sysconfdir); \ + echo "$(INSTALL_DATA) cpu.conf $(DESTDIR)$(sysconfdir)/cpu.conf"; \ + $(INSTALL_DATA) cpu.conf $(DESTDIR)$(sysconfdir)/cpu.conf; \ fi uninstall-local: - @@if test -f $(sysconfdir)/cpu.conf ; then \ - echo "rm -f $(sysconfdir)/cpu.conf"; \ - $(RM) -f $(sysconfdir)/cpu.conf; \ + @@if test -f $(DESTDIR)$(sysconfdir)/cpu.conf ; then \ + echo "rm -f $(DESTDIR)$(sysconfdir)/cpu.conf"; \ + $(RM) -f $(DESTDIR)$(sysconfdir)/cpu.conf; \ fi # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. Index: src/plugins/ldap/commandline.c --- src/plugins/ldap/commandline.c.orig 2004-01-12 06:31:02 +0100 +++ src/plugins/ldap/commandline.c 2005-10-10 23:40:07 +0200 @@@@ -83,7 +83,7 @@@@ if (passent == NULL) return -1; bzero (passent, sizeof (struct cpass)); - (int) passent->sp_lstchg = passent->sp_min = passent->sp_max = -10; + passent->sp_lstchg = passent->sp_min = passent->sp_max = -10; passent->sp_warn = passent->sp_inact = passent->sp_expire = -10; passent->sp_flag = -10; passent->pw_gid = -10; Index: src/plugins/ldap/ld.c --- src/plugins/ldap/ld.c.orig 2004-01-12 05:47:37 +0100 +++ src/plugins/ldap/ld.c 2005-10-10 23:45:34 +0200 @@@@ -803,7 +803,8 @@@@ return -10; if (gid != NULL) { - gid = ldap_get_values (ld, pos, gid)[0]; + temp = ldap_get_values (ld, pos, gid); + gid = (char *)temp[0]; if (gid != NULL) return atoi (gid); else @ 1.3 log @upgrading package: cpu 1.4.2 -> 1.4.3 @ text @d1 4 a4 4 diff -Naur cpu-1.4.1.orig/doc/Makefile.in cpu-1.4.1/doc/Makefile.in --- doc/Makefile.in 2003-09-22 06:07:10.000000000 +0200 +++ doc/Makefile.in 2003-09-22 10:19:24.000000000 +0200 @@@@ -446,18 +446,18 @@@@ d31 25 a55 1 @ 1.2 log @upgrading package: cpu 1.4.1 -> 1.4.2 @ text @d31 1 a31 15 --- src/include/util/bitvector.h.orig Sun Oct 12 20:57:39 2003 +++ src/include/util/bitvector.h Mon Oct 13 10:05:43 2003 @@@@ -5,7 +5,11 @@@@ extern "C" { #endif -#include +#include +#include +#ifdef HAVE_STDINT_H +#include +#endif #ifndef true #define true 1 @ 1.1 log @upgrading package: cpu 1.4.0a -> 1.4.1 @ text @d2 2 a3 2 --- cpu-1.4.1.orig/doc/Makefile.in 2003-09-22 06:07:10.000000000 +0200 +++ cpu-1.4.1/doc/Makefile.in 2003-09-22 10:19:24.000000000 +0200 d31 15 @