1 |
idl0r 10/06/28 20:36:35 |
2 |
|
3 |
Added: aiccu-2007.01.15-Makefile.patch |
4 |
aiccu.init.gentoo.patch |
5 |
Removed: init-after-ntp-client.patch |
6 |
patch_aiccu_ticservpar_2005.01.31 |
7 |
Log: |
8 |
Revbump. Fix bug 248669 and 318033. Some QA fixes. Add a Makefile patch to use LDFLAGS properly, make stripping optional and respect CFLAGS properly. Remove old ebuilds. |
9 |
(Portage version: 2.2_rc67/cvs/Linux x86_64) |
10 |
|
11 |
Revision Changes Path |
12 |
1.1 net-misc/aiccu/files/aiccu-2007.01.15-Makefile.patch |
13 |
|
14 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/aiccu/files/aiccu-2007.01.15-Makefile.patch?rev=1.1&view=markup |
15 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/aiccu/files/aiccu-2007.01.15-Makefile.patch?rev=1.1&content-type=text/plain |
16 |
|
17 |
Index: aiccu-2007.01.15-Makefile.patch |
18 |
=================================================================== |
19 |
--- unix-console/Makefile.old 2010-06-28 21:56:32.287782600 +0200 |
20 |
+++ unix-console/Makefile 2010-06-28 22:15:56.232637681 +0200 |
21 |
@@ -25,14 +25,11 @@ CWARNS += -W -Wall -Wshadow -Wpointer-ar |
22 |
# CWARNS += -Wpacked |
23 |
|
24 |
#CFLAGS += $(CWARNS) -D_GNU_SOURCE -D_DEBUG -g3 -O0 |
25 |
-CFLAGS += $(CWARNS) -D_GNU_SOURCE |
26 |
+CFLAGS ?= $(CWARNS) -O3 |
27 |
+CFLAGS += -D_GNU_SOURCE |
28 |
CC = @gcc |
29 |
RM = rm |
30 |
- |
31 |
-# Add -O3 when nothing is specified yet |
32 |
-ifeq ($(shell echo $(CFLAGS) | grep -c "\-O"),0) |
33 |
-CFLAGS += -O3 |
34 |
-endif |
35 |
+STRIP = strip |
36 |
|
37 |
# This is a console client |
38 |
CFLAGS += -D AICCU_CONSOLE |
39 |
@@ -42,7 +39,7 @@ CFLAGS += -D AICCU_CONSOLE |
40 |
# Currently defaultly builds only on Linux, but other platforms might easily also support it |
41 |
ifeq ($(shell uname | grep -c "Linux"),1) |
42 |
CFLAGS += -D AICCU_GNUTLS |
43 |
-LDFLAGS += -lgnutls |
44 |
+LIBS += -lgnutls |
45 |
endif |
46 |
|
47 |
# Linux |
48 |
@@ -50,7 +47,7 @@ ifeq ($(shell uname | grep -c "Linux"),1 |
49 |
CFLAGS += -D_LINUX -D HAS_IFHEAD -D AICCU_TYPE="\"linux\"" |
50 |
SRCS += ../common/aiccu_linux.c |
51 |
OBJS += ../common/aiccu_linux.o |
52 |
-LDFLAGS += -lpthread -lresolv |
53 |
+LIBS += -lpthread -lresolv |
54 |
endif |
55 |
|
56 |
# FreeBSD |
57 |
@@ -118,7 +115,7 @@ ifeq ($(shell uname | grep -c "Darwin"), |
58 |
CFLAGS += -D_DARWIN -D NEED_IFHEAD -D AICCU_TYPE="\"darwin\"" |
59 |
SRCS += ../common/aiccu_darwin.c |
60 |
OBJS += ../common/aiccu_darwin.o |
61 |
-LDFLAGS += -lresolv |
62 |
+LIBS += -lresolv |
63 |
endif |
64 |
|
65 |
# SunOS / Solaris |
66 |
@@ -126,7 +123,7 @@ ifeq ($(shell uname | grep -c "SunOS"),1 |
67 |
CFLAGS += -D_SUNOS -D AICCU_TYPE="\"sunos\"" |
68 |
SRCS += ../common/aiccu_sunos.c |
69 |
OBJS += ../common/aiccu_sunos.o |
70 |
-LDFLAGS += -lsocket -lnsl -lresolv |
71 |
+LIBS += -lsocket -lnsl -lresolv |
72 |
endif |
73 |
|
74 |
# AIX |
75 |
@@ -137,17 +134,19 @@ CFLAGS += -D AICCU_CONSOLE |
76 |
CFLAGS += -D_AIX -D AICCU_TYPE="\"aix\"" |
77 |
SRCS += ../common/aiccu_aix.c |
78 |
OBJS += ../common/aiccu_aix.o |
79 |
-LDFLAGS += -lpthread |
80 |
+LIBS += -lpthread |
81 |
endif |
82 |
|
83 |
|
84 |
all: aiccu |
85 |
|
86 |
aiccu: $(OBJS) ${SRCS} ${INCS} |
87 |
- $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJS) |
88 |
+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) |
89 |
ifeq ($(shell echo $(CFLAGS) | grep -c "DEBUG"),0) |
90 |
ifeq ($(shell echo "$(RPM_OPT_FLAGS)" | wc -c),1) |
91 |
- strip $@ |
92 |
+ifdef STRIP |
93 |
+ $(STRIP) $@ |
94 |
+endif |
95 |
endif |
96 |
endif |
97 |
|
98 |
|
99 |
|
100 |
|
101 |
1.1 net-misc/aiccu/files/aiccu.init.gentoo.patch |
102 |
|
103 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/aiccu/files/aiccu.init.gentoo.patch?rev=1.1&view=markup |
104 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/aiccu/files/aiccu.init.gentoo.patch?rev=1.1&content-type=text/plain |
105 |
|
106 |
Index: aiccu.init.gentoo.patch |
107 |
=================================================================== |
108 |
--- doc/aiccu.init.gentoo.old 2010-06-28 21:28:21.527614775 +0200 |
109 |
+++ doc/aiccu.init.gentoo 2010-06-28 21:36:49.651781540 +0200 |
110 |
@@ -23,14 +23,19 @@ checkconfig() { |
111 |
start() { |
112 |
checkconfig || return 1 |
113 |
ebegin "Starting aiccu" |
114 |
- start-stop-daemon --start --oknodo --quiet --exec /usr/sbin/aiccu -- start |
115 |
+ start-stop-daemon --start --quiet --exec /usr/sbin/aiccu -- start |
116 |
eend $? |
117 |
} |
118 |
|
119 |
|
120 |
stop() { |
121 |
ebegin "Stopping aiccu" |
122 |
- start-stop-daemon --stop --oknodo --quiet --exec /usr/sbin/aiccu -- stop |
123 |
+ start-stop-daemon --stop --pidfile /var/run/aiccu.pid --quiet --exec /usr/sbin/aiccu -- stop |
124 |
eend $? |
125 |
} |
126 |
|
127 |
+restart() { |
128 |
+ stop |
129 |
+ sleep 3 |
130 |
+ start |
131 |
+} |