Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/utils
In directory sc8-pr-cvs17:/tmp/cvs-serv7034
Modified Files:
screen.info screen.patch
Log Message:
new upstream version, and apple-supplied patches
Index: screen.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/utils/screen.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- screen.patch 20 Jan 2006 20:32:32 -0000 1.1
+++ screen.patch 16 Aug 2007 01:20:30 -0000 1.2
@@ -1,117 +1,93 @@
---- screen-4.0.2/Makefile.in.orig Thu Feb 14 07:36:33 2002
-+++ screen-4.0.2/Makefile.in Mon Jun 24 15:28:21 2002
-@@ -74,7 +74,7 @@
- -if [ -f $(DESTDIR)$(bindir)/$(SCREEN) ] && [ ! -f
$(DESTDIR)$(bindir)/$(SCREEN).old ]; \
- then mv $(DESTDIR)$(bindir)/$(SCREEN)
$(DESTDIR)$(bindir)/$(SCREEN).old; fi
- $(INSTALL_PROGRAM) screen $(DESTDIR)$(bindir)/$(SCREEN)
-- -chown root $(DESTDIR)$(bindir)/$(SCREEN) && chmod 4755
$(DESTDIR)$(bindir)/$(SCREEN)
-+# -chown root $(DESTDIR)$(bindir)/$(SCREEN) && chmod 4755
$(DESTDIR)$(bindir)/$(SCREEN)
- # This doesn't work if $(bindir)/screen is a symlink
+--- screen-4.0.3/Makefile.in.orig 2003-12-05 05:59:39.000000000 -0800
++++ screen-4.0.3/Makefile.in 2004-08-14 16:16:02.000000000 -0700
+@@ -79,7 +79,7 @@
-if [ -f $(DESTDIR)$(bindir)/screen ] && [ ! -f
$(DESTDIR)$(bindir)/screen.old ]; then mv $(DESTDIR)$(bindir)/screen
$(DESTDIR)$(bindir)/screen.old; fi
rm -f $(DESTDIR)$(bindir)/screen
---- screen-4.0.2/osdef.h.in.orig Sat Apr 28 08:26:43 2001
-+++ screen-4.0.2/osdef.h.in Mon Jun 24 16:12:04 2002
-@@ -87,16 +87,31 @@
- extern int setresuid __P((int, int, int));
- extern int setresgid __P((int, int, int));
- # else
-+# if defined(__MACH__) && defined(__APPLE__)
-+extern int setreuid __P((uid_t, uid_t));
-+extern int setregid __P((gid_t, gid_t));
-+# else
- extern int setreuid __P((int, int));
- extern int setregid __P((int, int));
-+# endif
- # endif
- #endif
-+
- #ifdef HAVE_SETEUID
-+# if defined(__MACH__) && defined(__APPLE__)
-+extern int seteuid __P((uid_t));
-+extern int setegid __P((gid_t));
-+# else
- extern int seteuid __P((int));
- extern int setegid __P((int));
-+# endif
- #endif
+ (cd $(DESTDIR)$(bindir) && ln -sf $(SCREEN) screen)
+- cp $(srcdir)/utf8encodings/?? $(DESTDIR)$(SCREENENCODINGS)
++ cp $(srcdir)/utf8encodings/?? $(DSTROOT)$(SCREENENCODINGS)
-+#if defined(__MACH__) && defined(__APPLE__)
-+extern char *crypt __P((const char *, const char *));
-+#else
- extern char *crypt __P((char *, char *));
-+#endif
- extern int putenv __P((char *));
+
###############################################################################
+ install: installdirs install_bin
+@@ -95,7 +95,7 @@
- extern int tgetent __P((char *, char *));
-@@ -116,25 +131,55 @@
- extern int kill __P((int, int));
+ installdirs:
+ # Path leading to ETCSCREENRC and Socketdirectory not checked.
+- $(srcdir)/etc/mkinstalldirs $(DESTDIR)$(bindir)
$(DESTDIR)$(SCREENENCODINGS)
++ $(srcdir)/etc/mkinstalldirs $(DESTDIR)$(bindir)
$(DSTROOT)$(SCREENENCODINGS)
+ cd doc ; $(MAKE) installdirs
- extern int getpid __P((void));
-+
-+#if defined(__MACH__) && defined(__APPLE__)
-+extern uid_t getuid __P((void));
-+#else
- extern int getuid __P((void));
-+#endif
-+
-+#if defined(__MACH__) && defined(__APPLE__)
-+extern uid_t geteuid __P((void));
-+extern gid_t getgid __P((void));
-+#else
- extern int geteuid __P((void));
- extern int getgid __P((void));
-+#endif
-+
-+#if defined(__MACH__) && defined(__APPLE__)
-+extern gid_t getegid __P((void));
-+#else
- extern int getegid __P((void));
-+#endif
-+
- struct passwd; /* for getpwuid __P */
- extern struct passwd *getpwuid __P((int));
- extern struct passwd *getpwnam __P((char *));
- extern int isatty __P((int));
-+#if defined(__MACH__) && defined(__APPLE__)
-+extern int chown __P((const char *, uid_t, gid_t));
-+#else
- extern int chown __P((char *, int, int));
-+#endif
- extern int rename __P((char *, char *));
+ uninstall: .version
+@@ -122,7 +122,7 @@
+ sh $(srcdir)/tty.sh tty.c
- extern int gethostname __P((char *, int));
-+#if defined(__MACH__) && defined(__APPLE__)
-+extern off_t lseek __P((int, off_t, int));
-+#else
- extern int lseek __P((int, int, int));
-+#endif
- extern void exit __P((int));
- extern char *getwd __P((char *));
- extern char *getenv __P((char *));
- extern time_t time __P((time_t *));
+ comm.h: comm.c comm.sh config.h
+- AWK=$(AWK) CC="$(CC) $(CFLAGS)" srcdir=${srcdir} sh $(srcdir)/comm.sh
++ AWK=$(AWK) srcdir=${srcdir} sh $(srcdir)/comm.sh
-+#if defined(__MACH__) && defined(__APPLE__)
-+extern char *getpass __P((const char *));
-+#else
- extern char *getpass __P((char *));
-+#endif
-+
- extern char *getlogin __P((void));
- extern char *ttyname __P((int));
+ osdef.h: osdef.sh config.h osdef.h.in
+ CPP="$(CPP) $(CPPFLAGS)" srcdir=${srcdir} sh $(srcdir)/osdef.sh
+--- screen-4.0.3/config.h.in.orig 2006-01-27 21:28:55.000000000 -0800
++++ screen-4.0.3/config.h.in 2006-01-27 21:30:48.000000000 -0800
+@@ -208,14 +208,14 @@
+ * If screen is installed with permissions to update /etc/utmp (such
+ * as if it is installed set-uid root), define UTMPOK.
+ */
+-#define UTMPOK
++#undef UTMPOK
-@@ -148,7 +193,11 @@
- extern void free __P((char *));
+ /* Set LOGINDEFAULT to one (1)
+ * if you want entries added to /etc/utmp by default, else set it to
+ * zero (0).
+ * LOGINDEFAULT will be one (1) whenever LOGOUTOK is undefined!
+ */
+-#define LOGINDEFAULT 1
++#undef LOGINDEFAULT
- #ifdef NAMEDPIPE
-+# if defined(__MACH__) && defined(__APPLE__)
-+extern int mknod __P((const char *, mode_t, dev_t));
-+# else
- extern int mknod __P((char *, int, int));
-+# endif
+ /* Set LOGOUTOK to one (1)
+ * if you want the user to be able to log her/his windows out.
+@@ -231,7 +231,7 @@
+ * Set CAREFULUTMP to one (1) if you want that users have at least one
+ * window per screen session logged in.
+ */
+-#define LOGOUTOK 1
++#undef LOGOUTOK
+ #undef CAREFULUTMP
+
+
+--- screen-4.0.3/configure.orig 2005-09-19 18:44:14.000000000 -0700
++++ screen-4.0.3/configure 2005-09-19 19:20:43.000000000 -0700
+@@ -5572,7 +5572,7 @@
+
+ #include <time.h> /* to get time_t on SCO */
+ #include <sys/types.h>
+-#if defined(SVR4) && !defined(DGUX)
++#if (defined(SVR4) || defined(__APPLE__)) && !defined(DGUX)
+ #include <utmpx.h>
+ #define utmp utmpx
#else
- struct sockaddr; /* for connect __P */
- extern int socket __P((int, int, int));
-
+@@ -5581,6 +5581,10 @@
+ #ifdef __hpux
+ #define pututline _pututline
+ #endif
++#ifdef __APPLE__
++#define pututline pututxline
++#define getutent getutxent
++#endif
+
+ int
+ main ()
+--- screen-4.0.3/pty.c.orig 2005-09-19 18:22:02.000000000 -0700
++++ screen-4.0.3/pty.c 2005-09-19 19:08:02.000000000 -0700
+@@ -34,7 +34,7 @@
+ #endif
+
+ /* for solaris 2.1, Unixware (SVR4.2) and possibly others */
+-#ifdef HAVE_SVR4_PTYS
++#if defined(HAVE_SVR4_PTYS) && !defined(__APPLE__)
+ # include <sys/stropts.h>
+ #endif
+
--- screen-4.0.2/screen.csh.orig Thu Jun 27 05:51:29 2002
+++ screen-4.0.2/screen.csh Thu Jun 27 05:51:22 2002
@@ -0,0 +1,6 @@
@@ -122,3 +98,52 @@
+ endif
+endif
+--- screen-4.0.3/window.c.orig 2006-09-05 17:08:57.000000000 -0700
++++ screen-4.0.3/window.c 2006-09-05 17:15:33.000000000 -0700
+@@ -25,6 +25,7 @@
+ #include <sys/stat.h>
+ #include <signal.h>
+ #include <fcntl.h>
++#include <unistd.h>
+ #ifndef sun
+ # include <sys/ioctl.h>
+ #endif
+@@ -1387,6 +1388,38 @@
+ return pid;
+ }
+
++#ifdef RUN_LOGIN
++/*
++ * All of the logic to maintain utmpx is now built into /usr/bin/login, so
++ * all we need to do is call it, and pass the shell command to it.
++ */
++extern char *LoginName;
++
++static int
++run_login(const char *path, char *const argv[], char *const envp[])
++{
++ const char *shargs[MAXARGS + 1 + 3];
++ const char **fp, **tp;
++
++ if (access(path, X_OK) < 0)
++ return -1;
++ shargs[0] = "login";
++ shargs[1] = (*argv[0] == '-') ? "-pfq" : "-pflq";
++ shargs[2] = LoginName;
++ shargs[3] = path;
++ fp = (const char **)argv + 1;
++ tp = shargs + 4;
++ /* argv has already been check for length */
++ while ((*tp++ = *fp++) != NULL) {}
++ /* shouldn't return unless there was an error */
++ return (execve("/usr/bin/login", (char *const*)shargs, envp));
++}
++
++/* replace the following occurrences of execve() with run_login() */
++#define execve run_login
++
++#endif /* RUN_LOGIN */
++
+ void
+ execvpe(prog, args, env)
+ char *prog, **args, **env;
Index: screen.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/utils/screen.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- screen.info 31 Aug 2006 13:33:25 -0000 1.2
+++ screen.info 16 Aug 2007 01:20:30 -0000 1.3
@@ -1,9 +1,11 @@
Package: screen
-Version: 4.0.2
+Version: 4.0.3
Revision: 1
-Source: gnu
-Source-MD5: ed68ea9b43d9fba0972cb017a24940a1
-Patch: %n.patch
+#Source: gnu
+Source: http://ftp.uni-erlangen.de/pub/utilities/screen/screen-4.0.3.tar.gz
+Source-MD5: 8506fd205028a96c741e4037de6e3c42
+PatchFile: %n.patch
+PatchFile-MD5: c55fb04a16f77d915729551d6bb9c968
ConfigureParams: --mandir='${prefix}/share/man'
--infodir='${prefix}/share/info'
InstallScript: <<
make install prefix=%i
@@ -13,8 +15,10 @@
<<
Description: Multiplexes a physical terminal
DescPort: <<
- Makefile patched so screen is not installed setuid-root.
- osdef.h.in patched to reflect defs from unistd.h
+ Patches from Apple's open source release:
+ http://www.opensource.apple.com/darwinsource/tarballs/other/screen-11.tar.gz
+
+ Thanks, Apple!
<<
License: GPL
DocFiles: INSTALL README COPYING FAQ NEWS
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Fink-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/fink-commits
