1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
|
require 'formula'
class Logrotate < Formula
url 'https://fedorahosted.org/releases/l/o/logrotate/logrotate-3.7.8.tar.gz'
homepage 'http://packages.debian.org/testing/admin/logrotate'
md5 'b3589bea6d8d5afc8a84134fddaae973'
depends_on 'popt'
def patches
# these patches emerge from the logrotate patch. Recursively nice!
debian_patches=['configparse.patch',
'datehack.patch',
'compressutime.patch',
'man-startcount.patch',
'dst.patch',
'dateext-504079.patch',
'rh-toolarge.patch',
'rh-curdir2.patch',
'copyloginfo-512152.patch',
'sharedscripts-519432.patch',
'chown-484762.patch',
'create-388608.patch',
'nofollow.patch',
'security-388608.patch'].collect {|p| "debian/patches/#{p}"}
[
DATA,
"https://launchpad.net/debian/sid/+source/logrotate/3.7.8-4/+files/logrotate_3.7.8-4.diff.gz",
*debian_patches
]
end
def install
system "make"
system "make", "install", "BASEDIR=#{prefix}"
end
end
__END__
diff --git a/config.c b/config.c
index 4e650f1..be7905a 100644
--- a/config.c
+++ b/config.c
@@ -12,6 +12,7 @@
#include <stdlib.h>
#include <string.h>
#include <sys/stat.h>
+#include <sys/syslimits.h>
#include <time.h>
#include <unistd.h>
#include <assert.h>
diff --git a/logrotate.c b/logrotate.c
index 6427465..f0614a8 100644
--- a/logrotate.c
+++ b/logrotate.c
@@ -10,6 +10,7 @@
#include <string.h>
#include <sys/stat.h>
#include <sys/wait.h>
+#include <sys/syslimits.h>
#include <time.h>
#include <unistd.h>
#include <glob.h>
diff --git a/Makefile b/Makefile
index f110ab5..49e55f4 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
VERSION = $(shell awk '/Version:/ { print $$2 }' logrotate.spec)
OS_NAME = $(shell uname -s)
LFS = $(shell echo `getconf LFS_CFLAGS 2>/dev/null`)
-CFLAGS = -Wall -D_GNU_SOURCE -D$(OS_NAME) -DVERSION=\"$(VERSION)\" $(RPM_OPT_FLAGS) $(LFS)
+CFLAGS += -D_GNU_SOURCE -D$(OS_NAME) -DVERSION=\"$(VERSION)\" $(RPM_OPT_FLAGS) $(LFS)
PROG = logrotate
MAN = logrotate.8
LOADLIBES = -lpopt
@@ -45,6 +45,15 @@ ifeq ($(OS_NAME),SunOS)
endif
endif
+# Darwin
+ifeq ($(OS_NAME),Darwin)
+ INSTALL = install
+ CC = gcc
+ ifeq ($(BASEDIR),)
+ BASEDIR = /usr/local
+ endif
+endif
+
# Red Hat Linux
ifeq ($(OS_NAME),Linux)
INSTALL = install
@@ -52,8 +61,8 @@ ifeq ($(OS_NAME),Linux)
endif
ifneq ($(POPT_DIR),)
- CFLAGS += -I$(POPT_DIR)
- LOADLIBES += -L$(POPT_DIR)
+ CFLAGS += -I$(POPT_DIR)/include
+ LOADLIBES += -L$(POPT_DIR)/lib
endif
ifneq ($(STATEFILE),)
@@ -61,7 +70,7 @@ ifneq ($(STATEFILE),)
endif
BINDIR = $(BASEDIR)/sbin
-MANDIR = $(BASEDIR)/man
+MANDIR = $(BASEDIR)/share/man
#--------------------------------------------------------------------------
@@ -70,7 +79,7 @@ SOURCES = $(subst .o,.c,$(OBJS) $(LIBOBJS))
ifeq ($(RPM_OPT_FLAGS),)
CFLAGS += -g
-LDFLAGS = -g
+LDFLAGS += -g
endif
ifeq (.depend,$(wildcard .depend))
@@ -89,7 +98,7 @@ clean:
rm -f $(OBJS) $(PROG) core* .depend
depend:
- $(CPP) $(CFLAGS) -M $(SOURCES) > .depend
+ $(CPP) $(CPPFLAGS) $(CFLAGS) -M $(SOURCES) > .depend
.PHONY : test
test: $(TARGET)
diff --git a/config.c b/config.c
index 4e650f1..9e9dc1c 100644
--- a/config.c
+++ b/config.c
@@ -93,7 +93,7 @@ static char *readPath(const char *configFile, int lineNum, char *key,
chptr = start;
- while( (len = mbrtowc(&pwc, chptr, strlen(chptr), NULL)) != 0 ) {
+ while( (len = strlen(chptr)) != 0 && (len = mbrtowc(&pwc, chptr, len, NULL)) != 0 ) {
if( len == (size_t)(-1) || len == (size_t)(-2) || !iswprint(pwc) || iswblank(pwc) ) {
message(MESS_ERROR, "%s:%d bad %s path %s\n",
configFile, lineNum, key, start);
/usr/local/src/logrotate-3.7.8
|
