]>
Commit | Line | Data |
---|---|---|
32266e39 JB |
1 | --- inn-2.6.4/doc/man/rnews.1.orig 2021-05-16 18:02:27.608638493 +0200 |
2 | +++ inn-2.6.4/doc/man/rnews.1 2021-05-16 18:06:02.730806409 +0200 | |
3 | @@ -191,7 +191,7 @@ | |
6a4c3728 | 4 | .PP |
32266e39 JB |
5 | Otherwise, if the command is any other word and the \fB\-a\fR flag is not |
6 | given, \fBrnews\fR will try to execute a program with that name, looking | |
7 | -for it in the directory \fIpathbin\fR/rnews.libexec. The rest of the | |
8 | +for it in the directory /usr/lib*/news/rnews . The rest of the | |
9 | batch will be fed to that program's standard input, and the standard | |
10 | output from the program will be treated as if it were the original | |
11 | input to \fBrnews\fR. \s-1INN\s0 comes with three such standard batch processors: | |
12 | @@ -210,7 +210,7 @@ | |
13 | .IP "\fB\-a\fR" 4 | |
14 | .IX Item "-a" | |
15 | By default, \fBrnews\fR looks for additional unpackers in the | |
16 | -\&\fIrnews.libexec\fR sub-directory of \fIpathbin\fR (as set in \fIinn.conf\fR). | |
17 | +/usr/lib*/news/rnews directory (as set in \fIinn.conf\fR). | |
18 | If \fB\-a\fR is given, no additional batch processor will be used; only | |
19 | \&\f(CW\*(C`rnews\*(C'\fR and \f(CW\*(C`cunbatch\*(C'\fR will be recognized as valid batch commands. | |
20 | .IP "\fB\-b\fR" 4 | |
6a4c3728 JB |
21 | --- inn-2.5.3/include/inn/paths.h.in.orig 2013-06-11 17:42:12.677373675 +0200 |
22 | +++ inn-2.5.3/include/inn/paths.h.in 2013-06-11 17:49:38.687364380 +0200 | |
23 | @@ -22,12 +22,12 @@ | |
95b08739 | 24 | /* Default prefix path is pathbin. */ |
6a4c3728 JB |
25 | #define INN_PATH_NNRPD "nnrpd" |
26 | #define INN_PATH_NNTPD "nnrpd" | |
27 | -#define INN_PATH_AUTHDIR "auth" | |
28 | +#define INN_PATH_AUTHDIR "@libdir@/news/auth" | |
29 | #define INN_PATH_AUTHDIR_GENERIC "generic" | |
30 | #define INN_PATH_AUTHDIR_NOPASS "resolv" | |
31 | #define INN_PATH_AUTHDIR_PASSWD "passwd" | |
32 | #define INN_PATH_CTLINND "ctlinnd" | |
33 | -#define INN_PATH_RNEWSPROGS "rnews.libexec" | |
34 | +#define INN_PATH_RNEWSPROGS "@libdir@/news/rnews" | |
d9177052 | 35 | |
95b08739 | 36 | /* Default prefix path is pathfilter. */ |
6a4c3728 | 37 | #define INN_PATH_PERL_STARTUP_INND "startup_innd.pl" |
6a4c3728 JB |
38 | --- inn-2.5.3/Makefile.global.in.orig 2013-06-11 17:54:53.957357808 +0200 |
39 | +++ inn-2.5.3/Makefile.global.in 2013-06-11 17:57:11.437354942 +0200 | |
40 | @@ -250,7 +250,7 @@ | |
41 | PATHAUTH = $(PATHBIN)/auth | |
42 | PATHAUTHRESOLV = $(PATHAUTH)/resolv | |
43 | PATHAUTHPASSWD = $(PATHAUTH)/passwd | |
44 | -PATHRNEWS = $(PATHBIN)/rnews.libexec | |
45 | +PATHRNEWS = @libdir@/news/rnews | |
46 | PATHARCHIVE = $(PATHSPOOL)/archive | |
47 | PATHARTICLES = $(PATHSPOOL)/articles | |
48 | PATHINCOMING = $(PATHSPOOL)/incoming | |
49 | @@ -282,8 +282,8 @@ | |
50 | RNEWSMODE = @RNEWSMODE@ | |
51 | FILEMODE = @FILEMODE@ | |
52 | ||
53 | -OWNER = -o $(RUNASUSER) -g $(RUNASGROUP) | |
54 | -ROWNER = -o $(RUNASUSER) -g $(RNEWSGROUP) | |
55 | +OWNER = | |
56 | +ROWNER = | |
95b08739 | 57 | |
6a4c3728 | 58 | INSTALL = $(top)/support/install-sh -c |
45c9b47c | 59 | |
6a4c3728 JB |
60 | --- inn-2.5.3/scripts/scanlogs.in.orig 2013-06-11 17:57:46.774020873 +0200 |
61 | +++ inn-2.5.3/scripts/scanlogs.in 2013-06-11 17:59:15.287352361 +0200 | |
62 | @@ -10,7 +10,7 @@ | |
63 | ## norotate Do not rotate logfiles. | |
45c9b47c JB |
64 | |
65 | ## Directory where old log files are kept. | |
66 | -OLD=${MOST_LOGS}/OLD | |
9e30a8f4 | 67 | +OLD=/var/log/archive/news |
6a4c3728 JB |
68 | |
69 | ## Files defined in innshellvars. We repeat them for clarity. | |
70 | ERRLOG=${MOST_LOGS}/errlog | |
71 | --- inn-2.5.3/scripts/inncheck.in.orig 2013-06-11 17:59:47.974018346 +0200 | |
72 | +++ inn-2.5.3/scripts/inncheck.in 2013-06-11 18:00:16.837351078 +0200 | |
73 | @@ -44,7 +44,7 @@ | |
74 | 'passwd.nntp', "$INN::Config::pathetc/passwd.nntp", | |
75 | 'readers.conf', "$INN::Config::pathetc/readers.conf", | |
76 | 'rnews', "$INN::Config::rnews", | |
77 | - 'rnewsprogs', "$INN::Config::pathbin/rnews.libexec", | |
65b062ff | 78 | + 'rnewsprogs', "@libdir@/news/rnews", |
6a4c3728 JB |
79 | 'spooltemp', "$INN::Config::pathtmp", |
80 | 'spool', "$INN::Config::patharticles", | |
81 | 'spoolnews', "$INN::Config::pathincoming", | |
82 | --- inn-2.5.3/frontends/Makefile.orig 2013-06-11 17:59:47.977351680 +0200 | |
83 | +++ inn-2.5.3/frontends/Makefile 2013-06-11 18:01:39.537349354 +0200 | |
84 | @@ -36,11 +36,11 @@ | |
65b062ff JB |
85 | for F in getlist innconfval sm ; do \ |
86 | $(LI_XPUB) $$F $D$(PATHBIN)/$$F ; \ | |
87 | done | |
6a4c3728 | 88 | - $(CP_XPUB) bunbatch $D$(PATHBIN)/rnews.libexec/bunbatch |
65b062ff JB |
89 | - $(CP_XPUB) c7unbatch $D$(PATHBIN)/rnews.libexec/c7unbatch |
90 | - $(LI_XPUB) decode $D$(PATHBIN)/rnews.libexec/decode | |
91 | - $(LI_XPUB) encode $D$(PATHBIN)/rnews.libexec/encode | |
92 | - $(CP_XPUB) gunbatch $D$(PATHBIN)/rnews.libexec/gunbatch | |
6a4c3728 | 93 | + $(CP_XPUB) bunbatch $D$(PATHRNEWS)/bunbatch |
65b062ff JB |
94 | + $(CP_XPUB) c7unbatch $D$(PATHRNEWS)/c7unbatch |
95 | + $(LI_XPUB) decode $D$(PATHRNEWS)/decode | |
96 | + $(LI_XPUB) encode $D$(PATHRNEWS)/encode | |
97 | + $(CP_XPUB) gunbatch $D$(PATHRNEWS)/gunbatch | |
98 | ||
6a4c3728 JB |
99 | bootstrap: $(MAN) |
100 |