This commit was manufactured by cvs2git to create branch 'unlabeled-1.27.2'.

Sprout from master 2003-03-04 22:28:51 UTC Paweł Gołaszewski <blues@pld-linux.org> '- location of cgi in macro, added with ra bcond'
Delete:
    ecartis-conf.patch
    ecartis-ipv6.patch
    ecartis-paths.patch
    ecartis.logrotate

diff --git a/ecartis-conf.patch b/ecartis-conf.patch
deleted file mode 100644 (file)
index b86c24b..0000000
--- a/ecartis-conf.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- ./ecartis.cfg.dist.org     Tue Mar 26 08:53:01 2002
-+++ ./ecartis.cfg.dist Mon Apr  8 12:37:04 2002
-@@ -32,10 +32,10 @@
- #    This is where to load the Ecartis modules from.   Defaults to
- #    listserver-root/modules
- #
--# listserver-root = /home/ecartis
--# listserver-conf = /home/ecartis
--# listserver-data = /home/ecartis
--# listserver-modules = /home/ecartis/modules
-+listserver-root = /usr/lib/ecartis
-+listserver-conf = /etc/ecartis
-+listserver-data = /var/lib/ecartis
-+listserver-modules = /usr/lib/ecartis/modules
- 
- # List directory
- # In the situation where you are virtual hosting, you could in fact
-@@ -46,7 +46,7 @@
- lists-root = lists
- 
- # Ecartis logfile location
--logfile = ./ecartis.log
-+logfile = /var/log/ecartis.log
- 
- # Paranoia (boolean)
- # Are we a paranoid installation?  Paranoid installations only allow

diff --git a/ecartis-ipv6.patch b/ecartis-ipv6.patch
deleted file mode 100644 (file)
index f42efa9..0000000
--- a/ecartis-ipv6.patch
+++ /dev/null
@@ -1,103 +0,0 @@
---- ./src/Makefile.dist.org    Fri Jul 19 08:45:04 2002
-+++ ./src/Makefile.dist        Mon Jul 29 17:55:33 2002
-@@ -93,6 +93,9 @@
- # If we have the timezone() function, we can try that as well
- #HAVE_TIMEZONE=-DHAVE_TIMEZONE
- 
-+# If we have the getaddrinfo() function, we can try that as well
-+#HAVE_GETADDRINFO=-DHAVE_GETADDRINFO
-+
- # If we don't have the strchr function then define this
- #NEED_STRCHR=-DNEED_STRCHR
- 
-@@ -129,9 +132,9 @@
- 
- # Now set up the initial command line.  SUNOS_5 makes this a bit wierd.
- ifndef SUNOS_5
--CFLAGS=-I./inc ${GNU_STRFTIME} ${NEED_SNPRINTF} ${NEED_FLOCK} ${DEC_UNIX} ${IRIX} ${USE_HITCHING_LOCK} ${NO_MEMMOVE} ${NEED_STRERROR} ${NO_TM_GMTOFF} ${HAVE_TZNAME} ${HAVE_TIMEZONE} ${NEED_STRCHR} ${NEED_STRRCHR} ${MY_PRINTF_IS_BRAINDEAD} ${DETECT_BROKEN_HOSTNAME}
-+CFLAGS=-I./inc ${GNU_STRFTIME} ${NEED_SNPRINTF} ${NEED_FLOCK} ${DEC_UNIX} ${IRIX} ${USE_HITCHING_LOCK} ${NO_MEMMOVE} ${NEED_STRERROR} ${NO_TM_GMTOFF} ${HAVE_TZNAME} ${HAVE_TIMEZONE} ${NEED_STRCHR} ${NEED_STRRCHR} ${MY_PRINTF_IS_BRAINDEAD} ${DETECT_BROKEN_HOSTNAME} ${HAVE_GETADDRINFO}
- else
--CFLAGS=-I./inc -DSUNOS_5 ${GNU_STRFTIME} ${NEED_SNPRINTF} ${NEED_FLOCK} ${USE_HITCHING_LOCK} ${NO_MEMMOVE} ${NEED_STRERROR} ${NO_TM_GMTOFF} ${HAVE_TZNAME} ${HAVE_TIMEZONE} ${NEED_STRCHR} ${NEED_STRRCHR} ${MY_PRINTF_IS_BRAINDEAD}
-+CFLAGS=-I./inc -DSUNOS_5 ${GNU_STRFTIME} ${NEED_SNPRINTF} ${NEED_FLOCK} ${USE_HITCHING_LOCK} ${NO_MEMMOVE} ${NEED_STRERROR} ${NO_TM_GMTOFF} ${HAVE_TZNAME} ${HAVE_TIMEZONE} ${NEED_STRCHR} ${NEED_STRRCHR} ${MY_PRINTF_IS_BRAINDEAD} ${HAVE_GETADDRINFO}
- endif
- 
- # Now set up the initial library path.  Once again, SUNOS_5 makes this
---- ./src/io.c.org     Fri Jul 19 08:45:04 2002
-+++ ./src/io.c Mon Jul 29 17:59:54 2002
-@@ -119,27 +119,57 @@
- /* Open a socket to a specific host/port */
- int sock_open(const char *conhostname, int port, LSOCKET *sock)
- {
--    struct hostent *conhost;
--    struct sockaddr_in name;
--    int addr_len;
--    int mysock;
-+      int mysock = -1;
-+#ifdef HAVE_GETADDRINFO
-+      char pbuf[NI_MAXSERV];
-+      struct addrinfo hints, *res, *res0;
-+      int gerr = 0;
- 
--    conhost = gethostbyname(conhostname);
--    if (conhost == 0)
--        return -1;
-+      sprintf(pbuf, "%d", port);
-+      pbuf[sizeof(pbuf)-1] = '\0';
-+      memset(&hints, 0, sizeof(hints));
-+      hints.ai_family = AF_UNSPEC;
-+      hints.ai_socktype = SOCK_STREAM;
-+      if (getaddrinfo(conhostname, pbuf, &hints, &res0) != 0)
-+              return -1;
- 
--    name.sin_port = htons(port);
--    name.sin_family = AF_INET;
--    bcopy((char *)conhost->h_addr, (char *)&name.sin_addr, conhost->h_length);
--    mysock = socket(AF_INET, SOCK_STREAM, 0);
--    addr_len = sizeof(name);
--   
--    if (connect(mysock, (struct sockaddr *)&name, addr_len) == -1)
--        return -1;
--
--    *sock = mysock;
-- 
--    return 0;
-+      for (res = res0; res != NULL; res = res->ai_next) {
-+              mysock = socket(res->ai_family, res->ai_socktype, 0);
-+              if (mysock == -1)
-+                      continue;
-+              if (connect(mysock, res->ai_addr, res->ai_addrlen) == -1) {
-+                      close(mysock);
-+                      continue;
-+              }
-+              gerr++;
-+              break;
-+      }
-+      freeaddrinfo(res0);
-+      if (gerr == 0)
-+              return -1;
-+#else /* HAVE_GETADDRINFO */
-+      
-+      struct hostent *conhost;
-+      struct sockaddr_in name;
-+      int addr_len;
-+      
-+      conhost = gethostbyname(conhostname);
-+      if (conhost == 0)
-+              return -1;
-+      
-+      name.sin_port = htons(port);
-+      name.sin_family = AF_INET;
-+      bcopy((char *)conhost->h_addr, (char *)&name.sin_addr, conhost->h_length);
-+      mysock = socket(AF_INET, SOCK_STREAM, 0);
-+      addr_len = sizeof(name);
-+      
-+      if (connect(mysock, (struct sockaddr *)&name, addr_len) == -1)
-+              return -1;
-+#endif /* HAVE_GETADDRINFO */
-+      
-+      *sock = mysock;
-+      
-+      return 0;
- }
- 
- int sock_close(LSOCKET sock)

diff --git a/ecartis-paths.patch b/ecartis-paths.patch
deleted file mode 100644 (file)
index ff34cd3..0000000
--- a/ecartis-paths.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- ./src/inc/config.h.org     Tue Mar  4 08:45:05 2003
-+++ ./src/inc/config.h Tue Mar  4 22:01:50 2003
-@@ -20,7 +20,7 @@
- #define SERVICE_NAME_UC "ECARTIS"
- #define SERVICE_NAME_MC "Ecartis"
- #define SERVICE_NAME_LC "ecartis"
--#define GLOBAL_CFG_FILE "ecartis.cfg"
-+#define GLOBAL_CFG_FILE "/etc/ecartis/ecartis.cfg"
- #define SERVICE_ADDRESS "ecartis@localhost"
- 
- #endif /* _CONFIG_H */
---- ./src/variables.c.org      Tue Mar  4 08:45:05 2003
-+++ ./src/variables.c  Tue Mar  4 22:03:50 2003
-@@ -1295,12 +1295,12 @@
-     register_var("default-flags", "|ECHOPOST|", "Basic Configuration",
-                  "Default flags given to a user when they are subscribed.",
-                  "default-flags = |NOPOST|DIGEST|", VAR_STRING, VAR_ALL);
--    register_var("global-blacklist", "banned", "Files",
-+    register_var("global-blacklist", "/etc/ecartis/banned", "Files",
-                  "Global file containing regular expressions for users who are not allowed to subscribe to lists hosted on this server.",
--                 "global-blacklist = banned", VAR_STRING, VAR_GLOBAL|VAR_SITE);
-+                 "global-blacklist = /etc/ecartis/banned", VAR_STRING, VAR_GLOBAL|VAR_SITE);
-     register_var("logfile", NULL, "Debugging",
-                  "Filename where debugging log information will be stored.",
--                 "logfile = ./server.log", VAR_STRING, VAR_GLOBAL|VAR_SITE);
-+                 "logfile = /var/log/ecartis.log", VAR_STRING, VAR_GLOBAL|VAR_SITE);
-     register_var("full-bounce", "no", "SMTP",
-                  "Should bounces contain the full message or only the headers.",
-                  "full-bounce = false", VAR_BOOL, VAR_ALL);
-@@ -1317,7 +1317,7 @@
-     register_var("moderate-verbose-subject", "yes", "Moderation",
-                  "Should moderated messages have a more informative subject?",
-                  "moderate-verbose-subject = yes", VAR_BOOL, VAR_ALL);
--    buffer_printf(buf, sizeof(buf) - 1, "%s.hlp", SERVICE_NAME_LC);
-+    buffer_printf(buf, sizeof(buf) - 1, "/etc/ecartis/%s.hlp", SERVICE_NAME_LC);
-     register_var("no-command-file", buf, "Files",
-                  "This is a global file to send if a message to the main listserver or request address has no commands.",
-                  "no-command-file = helpfile",VAR_STRING, VAR_GLOBAL|VAR_SITE);

diff --git a/ecartis.logrotate b/ecartis.logrotate
deleted file mode 100644 (file)
index 01e9f6d..0000000
--- a/ecartis.logrotate
+++ /dev/null
@@ -1,3 +0,0 @@
-/var/log/ecartis.log {
-       create 640 ecartis ecartis
-}