Accepting request 253118 from home:Andreas_Schwab:Factory

- sysklogd-1.4.1-reload.dif: remove bogus use of feature test macro
- sysklogd-1.4.1.dif: refresh
- sysklogd-1.4.1-glibc.patch: remove obsolete patch

OBS-URL: https://build.opensuse.org/request/show/253118
OBS-URL: https://build.opensuse.org/package/show/Base:System/syslogd?expand=0&rev=120

sysklogd-1.4.1-reload.dif

@@ -1,5 +1,7 @@
---- syslogd.c
-+++ syslogd.c	2010-03-29 15:12:11.000000000 +0000
+Index: syslogd.c
+===================================================================
+--- syslogd.c.orig
++++ syslogd.c
 @@ -565,7 +565,7 @@ char	**parts;
  int inetm = 0;
  static int debugging_on = 0;
@@ -17,127 +19,105 @@
  #ifndef TESTING
  	if ( Debug )
  	{
-@@ -1167,9 +1168,22 @@ int main(argc, argv)
+@@ -1167,9 +1168,14 @@ int main(argc, argv)
  				  (fd_set *) NULL, (struct timeval *) NULL);
  		if ( restart )
  		{
-+#ifndef _BSD_SOURCE
-+			int omask = sigblock(sigmask(SIGHUP));
-+#else
 +			sigset_t blockhup;
 +			sigemptyset(&blockhup);
 +			sigaddset  (&blockhup, SIGHUP);
 +			(void) sigprocmask(SIG_BLOCK, &blockhup, NULL);
-+#endif
 +			restart = 0;
  			dprintf("\nReceived SIGHUP, reloading syslogd.\n");
  			init();
 -			restart = 0;
-+#ifndef _BSD_SOURCE
-+			(void) sigsetmask(omask);
-+#else
 +			(void) sigprocmask (SIG_UNBLOCK, &blockhup, NULL);
-+#endif
  			continue;
  		}
  		if (nfds == 0) {
-@@ -1676,17 +1690,23 @@ void logmsg(pri, msg, from, flags)
+@@ -1676,18 +1682,16 @@ void logmsg(pri, msg, from, flags)
  	register struct filed *f;
  	int fac, prilev;
  	int msglen;
 -#ifndef SYSV
-+#ifndef _BSD_SOURCE
- 	int omask;
- #else
+-	int omask;
+-#else
  	int lognum;
+-#endif
 +	sigset_t nset, oset;
- #endif
  	char *timestamp;
  
  	dprintf("logmsg: %s, flags %x, from %s, msg %s\n", textpri(pri), flags, from, msg);
  
 -#ifndef SYSV
-+#ifndef _BSD_SOURCE
- 	omask = sigblock(sigmask(SIGHUP)|sigmask(SIGALRM));
-+#else
+-	omask = sigblock(sigmask(SIGHUP)|sigmask(SIGALRM));
+-#endif
 +	sigemptyset(&nset);
 +	sigaddset  (&nset, SIGHUP);
 +	sigaddset  (&nset, SIGALRM);
 +	(void)sigprocmask(SIG_BLOCK, &nset, &oset);
- #endif
  
  	/*
-@@ -1724,8 +1744,10 @@ void logmsg(pri, msg, from, flags)
+ 	 * Check to see if msg looks non-standard.
+@@ -1724,9 +1728,7 @@ void logmsg(pri, msg, from, flags)
  			(void) close(f->f_file);
  			f->f_file = -1;
  		}
 -#ifndef SYSV
-+#ifndef _BSD_SOURCE
- 		(void) sigsetmask(omask);
-+#else
+-		(void) sigsetmask(omask);
+-#endif
 +		(void)sigprocmask(SIG_SETMASK, &oset, NULL);
- #endif
  		return;
  	}
-@@ -1789,8 +1811,10 @@ void logmsg(pri, msg, from, flags)
+ #ifdef SYSV
+@@ -1789,9 +1791,7 @@ void logmsg(pri, msg, from, flags)
  			}
  		}
  	}
 -#ifndef SYSV
-+#ifndef _BSD_SOURCE
- 	(void) sigsetmask(omask);
-+#else
+-	(void) sigsetmask(omask);
+-#endif
 +	(void)sigprocmask(SIG_SETMASK, &oset, NULL);
- #endif
  }
  #if FALSE
-@@ -2108,7 +2132,7 @@ void wallmsg(f, iov)
+ } /* balance parentheses for emacs */
+@@ -2108,10 +2108,6 @@ void wallmsg(f, iov)
  		(void) signal(SIGTERM, SIG_DFL);
  		(void) alarm(0);
  		(void) signal(SIGALRM, endtty);
 -#ifndef SYSV
-+#ifndef _BSD_SOURCE
- 		(void) signal(SIGTTOU, SIG_IGN);
- 		(void) sigsetmask(0);
- #endif
-@@ -2178,14 +2202,14 @@ void wallmsg(f, iov)
+-		(void) signal(SIGTTOU, SIG_IGN);
+-		(void) sigsetmask(0);
+-#endif
+ 		(void) snprintf(greetings, sizeof(greetings),
+ 		    "\r\n\7Message from syslogd@%s at %.24s ...\r\n",
+ 			(char *) iov[2].iov_base, ctime(&now));
+@@ -2178,16 +2174,8 @@ void wallmsg(f, iov)
  void reapchild()
  {
  	int saved_errno = errno;
 -#if defined(SYSV) && !defined(linux)
-+#if defined(SYSV) && !defined(_BSD_SOURCE)
- 	(void) signal(SIGCHLD, reapchild);	/* reset signal handler -ASP */
- 	wait ((int *)0);
- #else
+-	(void) signal(SIGCHLD, reapchild);	/* reset signal handler -ASP */
+-	wait ((int *)0);
+-#else
  	while (waitpid(-1, (int*)0, WNOHANG|WUNTRACED) > 0)
  		;
- #endif
+-#endif
 -#ifdef linux
-+#ifndef _BSD_SOURCE
- 	(void) signal(SIGCHLD, reapchild);	/* reset signal handler -ASP */
- #endif
+-	(void) signal(SIGCHLD, reapchild);	/* reset signal handler -ASP */
+-#endif
  	errno = saved_errno;
-@@ -2318,7 +2342,9 @@ void debug_switch()
+ }
+ 
+@@ -2318,7 +2306,6 @@ void debug_switch()
  {
  	dprintf("Switching debugging_on to %s\n", (debugging_on == 0) ? "true" : "false");
  	debugging_on = (debugging_on == 0) ? 1 : 0;
-+#ifndef _BSD_SOURCE
- 	signal(SIGUSR1, debug_switch);
-+#endif
+-	signal(SIGUSR1, debug_switch);
  }
  
  
-@@ -2350,7 +2376,9 @@ void die(int sig)
- 	(void) snprintf(buf, sizeof(buf), "exiting on signal %d", sig);
- 	errno = 0;
- 	logmsg(LOG_SYSLOG|LOG_INFO, buf, LocalHostName, ADDDATE);
-+#ifdef _BSD_SOURCE
- 	signal(sig, SIG_IGN);
-+#endif
- }
- 
- void dienow(void)
-@@ -2664,7 +2692,6 @@ void init()
+@@ -2664,7 +2651,6 @@ void init()
  		logmsg(LOG_SYSLOG|LOG_INFO, "syslogd " VERSION "." PATCHLEVEL \
  		       ": restart." , LocalHostName, ADDDATE);
  #endif
@@ -145,13 +125,11 @@
  	dprintf("syslogd: restarted.\n");
  }
  #if FALSE
-@@ -3061,7 +3088,9 @@ void sighup_handler()
+@@ -3061,7 +3047,6 @@ void sighup_handler()
  
  {
  	restart = 1;
-+#ifndef _BSD_SOURCE
- 	signal(SIGHUP, sighup_handler);
-+#endif
+-	signal(SIGHUP, sighup_handler);
  	return;
  }