cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- update eterm to 0.9.4

Browse Source 
- rename/regen some patches
This commit is contained in:
jasper 2007-11-18 12:55:58 +00:00
parent d398763267
commit fa54b126e9
22 changed files with 374 additions and 469 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
x11/eterm/Makefile
View File

@ -1,41 +1,63 @@
# $OpenBSD: Makefile,v 1.23 2007/09/15 20:04:19 merdely Exp $
# $OpenBSD: Makefile,v 1.24 2007/11/18 12:55:58 jasper Exp $
COMMENT= color X11 terminal emulator with transparency support
COMMENT-kanji= color japanese terminal emulator with transparency support
PKGNAME= eterm-0.8.10p0
FULLPKGNAME-kanji= ja-eterm-0.8.10p0
DISTNAME= Eterm-0.8.10
SHARED_LIBS= Eterm 0.8 \
mej 0.8
V= 0.9.4
DISTNAME= Eterm-$V
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
Eterm-bg-scale-1${EXTRACT_SUFX}:0 \
Eterm-bg-scale-2${EXTRACT_SUFX}:0 \
Eterm-bg-tile${EXTRACT_SUFX}:0
PKGNAME= eterm-$V
FULLPKGNAME-kanji= ja-eterm-$V
SHARED_LIBS += Eterm 1.0 # .0.0
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=eterm/}
HOMEPAGE= http://eterm.sourceforge.net/
LIB_DEPENDS= Imlib.>=19::graphics/imlib
HOMEPAGE= http://www.eterm.org/
# GPL with some custom licenses
PERMIT_PACKAGE_CDROM= may not sell
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= may not sell
PERMIT_DISTFILES_FTP= Yes
WANTLIB= ICE SM X11 Xext c jpeg m png tiff ungif util z
MASTER_SITES= ${HOMEPAGE}/download/ \
${MASTER_SITE_SOURCEFORGE:=eterm/}
MASTER_SITES0= http://freeware.sgi.com/source/Eterm/
WANTLIB= ICE Imlib2 SM X11 XRes Xau Xdmcp Xext Xmu Xt c freetype \
m util z
LIB_DEPENDS= ast::devel/libast
USE_X11= Yes
USE_LIBTOOL= Yes
CONFIGURE_STYLE=gnu
CONFIGURE_ARGS= ${CONFIGURE_SHARED}
CONFIGURE_ARGS= ${CONFIGURE_SHARED} \
--enable-trans \
--enable-utmp \
--enable-xim \
--with-theme-update \
--with-backspace=bs \
--without-terminfo
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
FLAVORS= kanji
FLAVOR?=
.if ${FLAVOR:L:Mkanji}
CFLAGS+= -DKANJI
CATEGORIES+= japanese
CONFIGURE_ARGS+=--enable-multi-charset=kanji
.else
CONFIGURE_ARGS+=--enable-multi-charset
.endif
pre-extract:
ln -sf ${WRKSRC} ${WRKDIR}/Eterm
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/Eterm
${INSTALL_DATA} ${WRKSRC}/ReleaseNotes ${PREFIX}/share/doc/Eterm

25
x11/eterm/distinfo
View File

@ -1,5 +1,20 @@
MD5 (Eterm-0.8.10.tar.gz) = RLC0mNgYYgXQiYsmZkP78Q==
RMD160 (Eterm-0.8.10.tar.gz) = vuD4+ELTo1OM3qg9djiCdiLpqTU=
SHA1 (Eterm-0.8.10.tar.gz) = DK/uwsnXnIdMazEtyxBbkSForQ0=
SHA256 (Eterm-0.8.10.tar.gz) = iNPeas/2UpyMwx/8pIfCAXGxmssrEXKNPW6CAjZKKEo=
SIZE (Eterm-0.8.10.tar.gz) = 593026
MD5 (Eterm-0.9.4.tar.gz) = uIae6cm5UWIxr57vpZXO4w==
MD5 (Eterm-bg-scale-1.tar.gz) = j+B1wRist78FCltha/dk4A==
MD5 (Eterm-bg-scale-2.tar.gz) = uhs87sUb1Blt8biHyDlkdQ==
MD5 (Eterm-bg-tile.tar.gz) = JKYPM6NhG0x6boorZdwSDQ==
RMD160 (Eterm-0.9.4.tar.gz) = zl17p0sZ48iZLRBNAPEDAsPoFQ4=
RMD160 (Eterm-bg-scale-1.tar.gz) = yv2gtctCgD1LVzuwWV5u+DtUv+I=
RMD160 (Eterm-bg-scale-2.tar.gz) = JfM/QGL6nMf9jccsElxubcIKCO0=
RMD160 (Eterm-bg-tile.tar.gz) = Q3YcxSdzCgMF/YV/rRMWuP0E7v4=
SHA1 (Eterm-0.9.4.tar.gz) = 1jYoCYs6oIyPK8G9dWaD5f0ieZU=
SHA1 (Eterm-bg-scale-1.tar.gz) = OcYUZ0Dt8E3bCqQO1OB46DF7BVc=
SHA1 (Eterm-bg-scale-2.tar.gz) = cRNltEeNx8s4kcd6XZBUd4xYEYQ=
SHA1 (Eterm-bg-tile.tar.gz) = LMsxqP0OgOXdkq6+9rr1VU9m42E=
SHA256 (Eterm-0.9.4.tar.gz) = Dq66EleBJ2/nMAsyDNfBgPQczUfU3L2yFK2J3T/FQgo=
SHA256 (Eterm-bg-scale-1.tar.gz) = IY6fChvkbePp12O3W2PGnnHm4HacOWYOejAC9xfe2sE=
SHA256 (Eterm-bg-scale-2.tar.gz) = WR+/YTb5yjKH0OegIb8RnRtbAQSphbMzY5GR8eI4sXE=
SHA256 (Eterm-bg-tile.tar.gz) = dxgAgWZPnIDC8kKBhdIzO626/Ajv05s14lMK+8Q95CE=
SIZE (Eterm-0.9.4.tar.gz) = 814823
SIZE (Eterm-bg-scale-1.tar.gz) = 3420298
SIZE (Eterm-bg-scale-2.tar.gz) = 3145775
SIZE (Eterm-bg-tile.tar.gz) = 1568166

12
x11/eterm/patches/patch-config.h.in
View File

@ -1,12 +0,0 @@
--- config.h.in.orig Sat Aug 12 04:48:22 2000
+++ config.h.in Sat Aug 12 04:48:42 2000
@@ -154,6 +154,9 @@
/* Define if you have the seteuid function. */
#undef HAVE_SETEUID
+/* Define if you have the setegid function. */
+#undef HAVE_SETEGID
+
/* Define if you have the setresgid function. */
#undef HAVE_SETRESGID

13
x11/eterm/patches/patch-config_h_in Normal file
View File

@ -0,0 +1,13 @@
$OpenBSD: patch-config_h_in,v 1.1 2007/11/18 12:55:58 jasper Exp $
--- config.h.in.orig Tue Aug 22 20:25:54 2006
+++ config.h.in Wed Nov 14 17:14:21 2007
@@ -174,6 +174,9 @@
/* Define to 1 if you have the `seteuid' function. */
#undef HAVE_SETEUID
+/* Define if you have the setegid function. */
+#undef HAVE_SETEGID
+
/* Define to 1 if you have the `setresgid' function. */
#undef HAVE_SETRESGID

19
x11/eterm/patches/patch-configure
View File

@ -1,11 +1,14 @@
--- configure.orig Fri Nov 5 19:56:30 1999
+++ configure Thu Mar 7 20:46:29 2002
@@ -3822,7 +3822,7 @@ cat >> confdefs.h <<EOF
EOF
$OpenBSD: patch-configure,v 1.3 2007/11/18 12:55:58 jasper Exp $
--- configure.orig Wed Nov 14 17:13:40 2007
+++ configure Wed Nov 14 17:14:03 2007
@@ -22843,8 +22843,8 @@ _ACEOF
-for ac_func in atexit _exit unsetenv setutent seteuid memmove putenv strsep setresuid setresgid memmem usleep snprintf
+for ac_func in atexit _exit unsetenv setutent seteuid setegid memmove putenv strsep setresuid setresgid memmem usleep snprintf
for ac_func in atexit _exit unsetenv setutent \
-seteuid memmove putenv strsep setresuid setresgid \
-memmem usleep snprintf strcasestr strcasechr \
+seteuid setegid memmove putenv strsep setresuid \
+setresgid memmem usleep snprintf strcasestr strcasechr \
strcasepbrk strrev nl_langinfo \
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
echo "configure:3829: checking for $ac_func" >&5

22
x11/eterm/patches/patch-doc_Makefile_in
View File

@ -1,12 +1,12 @@
$OpenBSD: patch-doc_Makefile_in,v 1.1 2000/10/30 22:44:01 espie Exp $
--- doc/Makefile.in.orig Mon Oct 30 23:21:15 2000
+++ doc/Makefile.in Mon Oct 30 23:21:33 2000
@@ -253,7 +253,7 @@ Eterm.1: $(top_srcdir)/doc/Eterm.1.in
$OpenBSD: patch-doc_Makefile_in,v 1.2 2007/11/18 12:55:58 jasper Exp $
--- doc/Makefile.in.orig Wed Nov 14 17:01:18 2007
+++ doc/Makefile.in Wed Nov 14 17:02:03 2007
@@ -414,7 +414,7 @@ uninstall-man: uninstall-man1
uninstall-man1
-all: Makefile Eterm.1.html
+all: Makefile
Eterm.1: $(top_srcdir)/doc/Eterm.1.in
$(SED) -e 's%@''VERSION''@%$(VERSION)%g' -e 's%@''DATE''@%$(DATE)%g' -e 's%@THEMEDIR@%$(pkgdatadir)/themes%g' $(top_srcdir)/doc/$@.in > $@
Eterm.1.html: Eterm.1
- -nroff -man $< | man2html > $@
+ -nroff -man Eterm.1 | man2html > $@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.

11
x11/eterm/patches/patch-kanji
View File

@ -1,11 +0,0 @@
--- src/menubar.c.orig Sun Apr 2 18:52:33 2000
+++ src/menubar.c Sun Apr 2 18:53:07 2000
@@ -41,6 +41,8 @@ static const char cvs_ident[] = "$Id: me
# include "options.h"
#endif
+/* Force KANJI to be undef'ed, since we don't have X locale support yet */
+#undef KANJI
#ifdef KANJI
# ifdef NO_XLOCALE
# include <locale.h>

12
x11/eterm/patches/patch-libmej_Makefile.in
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-libmej_Makefile.in,v 1.4 2006/01/12 01:05:22 naddy Exp $
--- libmej/Makefile.in.orig Fri Nov 5 20:03:53 1999
+++ libmej/Makefile.in Thu Mar 7 20:46:29 2002
@@ -107,7 +107,7 @@ libmej_la_SOURCES = debug.c mem.c string
INCLUDES = -I. -I$(top_srcdir) -I$(top_srcdir)/src -I.. -I$(includedir) -I$(prefix)/include $(X_CFLAGS)
-libmej_la_LDFLAGS = -release $(VERSION)
+libmej_la_LDFLAGS = -version-info 0:0:0
EXTRA_DIST = debug.h global.h mem.h strings.h strptime.h strptime.c
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs

12
x11/eterm/patches/patch-src_Makefile.in
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-src_Makefile.in,v 1.4 2006/01/12 01:05:22 naddy Exp $
--- src/Makefile.in.orig Fri Nov 5 20:03:54 1999
+++ src/Makefile.in Thu Mar 7 20:46:29 2002
@@ -106,7 +106,7 @@ lib_LTLIBRARIES = libEterm.la
libEterm_la_SOURCES = activeconfig.c activeeterm.c activetags.c command.c graphics.c grkelot.c menubar.c misc.c netdisp.c options.c pixmap.c screen.c scrollbar.c system.c threads.c utmp.c
libEterm_la_DEPENDENCIES = $(DIST_ROOT)/libmej/libmej.la feature.h
-libEterm_la_LDFLAGS = -release $(VERSION)
+libEterm_la_LDFLAGS = -version-info 0:0:0
bin_PROGRAMS = Eterm
Eterm_SOURCES = main.c

12
x11/eterm/patches/patch-src_Makefile_in Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-src_Makefile_in,v 1.1 2007/11/18 12:55:58 jasper Exp $
--- src/Makefile.in.orig Wed Nov 14 17:36:17 2007
+++ src/Makefile.in Wed Nov 14 17:36:35 2007
@@ -257,7 +257,7 @@ libEterm_la_SOURCES = actions.c actions.h buttons.c bu
defaultfont.h libscream.c scream.h screamcfg.h
EXTRA_libEterm_la_SOURCES = $(MMX_SRCS) $(SSE2_SRCS)
-libEterm_la_LDFLAGS = -release $(VERSION)
+libEterm_la_LDFLAGS = -version-info 0:0:0
@HAVE_MMX_FALSE@@HAVE_SSE2_FALSE@libEterm_la_DEPENDENCIES = feature.h
@HAVE_MMX_TRUE@@HAVE_SSE2_FALSE@libEterm_la_DEPENDENCIES = feature.h $(MMX_OBJS)
@HAVE_SSE2_TRUE@libEterm_la_DEPENDENCIES = feature.h $(SSE2_OBJS)

87
x11/eterm/patches/patch-src_command.c
View File

@ -1,87 +0,0 @@
--- src/command.c.orig 1999-11-02 08:34:13.000000000 -0800
+++ src/command.c 2004-04-23 18:40:51.000000000 -0700
@@ -248,11 +248,7 @@ ioctl (fd, TIOCLSET, &(tt->local));\
# define CQUIT '\034' /* ^\ */
#endif
#ifndef CERASE
-# ifdef linux
# define CERASE '\177' /* ^? */
-# else
-# define CERASE '\010' /* ^H */
-# endif
#endif
#ifndef CKILL
# define CKILL '\025' /* ^U */
@@ -284,6 +280,9 @@ ioctl (fd, TIOCLSET, &(tt->local));\
#ifndef CLNEXT
# define CLNEXT '\026' /* ^V */
#endif
+#ifndef STATUS
+# define STATUS '\024' /* ^T */
+#endif
#ifndef VDISCRD
# ifdef VDISCARD
@@ -676,6 +675,8 @@ privileges(int mode)
#ifdef HAVE_SETRESGID
setresgid(my_rgid, my_rgid, my_egid);
+#elif defined(HAVE_SAVED_UIDS) && defined(HAVE_SETEGID)
+ setegid(my_rgid);
#elif defined(HAVE_SAVED_UIDS)
setregid(my_rgid, my_rgid);
#else
@@ -685,6 +686,8 @@ privileges(int mode)
#ifdef HAVE_SETRESUID
setresuid(my_ruid, my_ruid, my_euid);
+#elif defined(HAVE_SAVED_UIDS) && defined(HAVE_SETEUID)
+ seteuid(my_ruid);
#elif defined(HAVE_SAVED_UIDS)
setreuid(my_ruid, my_ruid);
#else
@@ -705,6 +708,8 @@ privileges(int mode)
#ifdef HAVE_SETRESUID
setresuid(my_ruid, my_euid, my_euid);
+#elif defined(HAVE_SAVED_UIDS) && defined(HAVE_SETEUID)
+ seteuid(my_euid);
#elif defined(HAVE_SAVED_UIDS)
setreuid(my_ruid, my_euid);
#else
@@ -714,6 +719,8 @@ privileges(int mode)
#ifdef HAVE_SETRESGID
setresgid(my_rgid, my_egid, my_egid);
+#elif defined(HAVE_SAVED_UIDS) && defined(HAVE_SETEGID)
+ setegid(my_egid);
#elif defined(HAVE_SAVED_UIDS)
setregid(my_rgid, my_egid);
#else
@@ -2057,6 +2064,9 @@ get_ttymode(ttymode_t * tio)
# ifdef VLNEXT
tio->c_cc[VLNEXT] = CLNEXT;
# endif
+# ifdef VSTATUS
+ tio->c_cc[VSTATUS] = STATUS;
+# endif
}
tio->c_cc[VEOF] = CEOF;
tio->c_cc[VEOL] = VDISABLE;
@@ -2298,8 +2308,16 @@ run_command(char *argv[])
because the exec*() calls reset the saved uid/gid to the
effective uid/gid -- mej */
# ifndef __CYGWIN32__
+#ifdef HAVE_SETEGID
+ setegid(my_rgid);
+#else
setregid(my_rgid, my_rgid);
+#endif
+#ifdef HAVE_SETEUID
+ seteuid(my_ruid);
+#else
setreuid(my_ruid, my_ruid);
+#endif
# endif /* __CYGWIN32__ */
#endif /* _HPUX_SOURCE */

12
x11/eterm/patches/patch-src_eterm_utmp_h Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-src_eterm_utmp_h,v 1.1 2007/11/18 12:55:58 jasper Exp $
--- src/eterm_utmp.h.orig Wed Nov 14 17:28:42 2007
+++ src/eterm_utmp.h Wed Nov 14 17:29:05 2007
@@ -69,7 +69,7 @@
# ifdef HAVE_LASTLOG_H
# include <lastlog.h>
# endif
-# if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__bsdi__) || defined(__DragonFly__)
+# if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__bsdi__) || defined(__DragonFly__)
# include <ttyent.h>
# define NEW_BSD_UTMP
# endif

20
x11/eterm/patches/patch-src_feature.h.in
View File

@ -1,20 +0,0 @@
--- src/feature.h.in.orig 1999-08-18 16:54:02.000000000 -0700
+++ src/feature.h.in 2004-04-23 19:02:54.000000000 -0700
@@ -219,7 +219,7 @@
#endif
/* Force the Backspace key to send ^H instead of checking the stty setting */
-#define FORCE_BACKSPACE
+/* #define FORCE_BACKSPACE */
/* Force Backspace to send ^? */
/* #define FORCE_DELETE */
@@ -380,7 +380,7 @@
* may seem to be owned by root. But if you define this and don't have them,
* the utmp and tty stuff could break. Do some testing. DO NOT get this one
* wrong! */
-/* #define HAVE_SAVED_UIDS */
+#define HAVE_SAVED_UIDS
/* Use getgrnam() to determine the group id of TTY_GRP_NAME, and chgrp tty
* device files to that group. This should be ok on SVR4 and Linux systems

105
x11/eterm/patches/patch-src_options.c
View File

@ -1,105 +0,0 @@
--- src/options.c.orig Tue Nov 2 17:34:35 1999
+++ src/options.c Thu Mar 7 20:46:30 2002
@@ -1328,6 +1328,10 @@ get_initial_options(int argc, char *argv
#define CTX_UNDEF ((unsigned char) -1)
#define CTX_MAX 8
+/* Template for mkstemp */
+
+#define MKSTEMP_TEMPLATE "eterm.XXXXXXXXXX"
+
/* This structure defines a context and its attributes */
struct context_struct {
@@ -1566,6 +1570,7 @@ shell_expand(char *s)
unsigned long fsize, cnt1 = 0, cnt2 = 0;
const unsigned long max = CONFIG_BUFF - 1;
char *Command, *Output, *EnvVar, *OutFile;
+ int fd = -1;
FILE *fp;
ASSERT_RVAL(s != NULL, (char *) NULL);
@@ -1716,40 +1721,51 @@ shell_expand(char *s)
}
ASSERT(l < CONFIG_BUFF);
Command[l] = 0;
- OutFile = tmpnam(NULL);
- if (l + strlen(OutFile) + 8 > CONFIG_BUFF) {
- print_error("Parse error in file %s, line %lu: Cannot execute command, line too long",
- file_peek_path(), file_peek_line());
- return ((char *) NULL);
- }
- strcat(Command, " >");
- strcat(Command, OutFile);
- system(Command);
- if ((fp = fopen(OutFile, "rb")) != NULL) {
- fseek(fp, 0, SEEK_END);
- fsize = ftell(fp);
- rewind(fp);
- if (fsize) {
- Output = (char *) MALLOC(fsize + 1);
- fread(Output, fsize, 1, fp);
- Output[fsize] = 0;
- fclose(fp);
- remove(OutFile);
- Output = CondenseWhitespace(Output);
- strncpy(new + j, Output, max - j);
- cnt1 = strlen(Output) - 1;
- cnt2 = max - j - 1;
- j += MIN(cnt1, cnt2);
- FREE(Output);
+ OutFile = (char *) MALLOC(sizeof(MKSTEMP_TEMPLATE) + sizeof(P_tmpdir) + 1);
+ strcpy(OutFile,P_tmpdir);
+ strcat(OutFile,MKSTEMP_TEMPLATE);
+ if ((fd = mkstemp( OutFile )) != -1)
+ {
+ if (l + strlen(OutFile) + 8 > CONFIG_BUFF) {
+ print_error("Parse error in file %s, line %lu: Cannot execute command, line too long",
+ file_peek_path(), file_peek_line());
+ return ((char *) NULL);
+ }
+ close( fd );
+ strcat(Command, " >>");
+ strcat(Command, OutFile);
+ system(Command);
+ if ((fp = fopen(OutFile, "rb")) != NULL) {
+ fseek(fp, 0, SEEK_END);
+ fsize = ftell(fp);
+ rewind(fp);
+ if (fsize) {
+ Output = (char *) MALLOC(fsize + 1);
+ fread(Output, fsize, 1, fp);
+ Output[fsize] = 0;
+ fclose(fp);
+ remove(OutFile);
+ Output = CondenseWhitespace(Output);
+ strncpy(new + j, Output, max - j);
+ cnt1 = strlen(Output) - 1;
+ cnt2 = max - j - 1;
+ j += MIN(cnt1, cnt2);
+ FREE(Output);
+ } else {
+ print_warning("Command at line %lu of file %s returned no output.", file_peek_line(), file_peek_path());
+ }
} else {
- print_warning("Command at line %lu of file %s returned no output.", file_peek_line(), file_peek_path());
+ print_warning("Output file %s could not be created. (line %lu of file %s)", NONULL(OutFile),
+ file_peek_line(), file_peek_path());
}
- } else {
- print_warning("Output file %s could not be created. (line %lu of file %s)", NONULL(OutFile),
- file_peek_line(), file_peek_path());
- }
- FREE(Command);
- } else {
+ }
+ else {
+ print_warning("Output file %s could not be opened. (line %lu of file %s)", NONULL(OutFile),
+ file_peek_line(), file_peek_path());
+ }
+ FREE(Command);
+ FREE(OutFile);
+ } else {
new[j] = *pbuff;
}
#else

13
x11/eterm/patches/patch-src_pixmap_c Normal file
View File

@ -0,0 +1,13 @@
$OpenBSD: patch-src_pixmap_c,v 1.1 2007/11/18 12:55:58 jasper Exp $
--- src/pixmap.c.orig Wed Nov 14 18:27:41 2007
+++ src/pixmap.c Wed Nov 14 18:31:19 2007
@@ -1916,7 +1916,8 @@ update_desktop_info(int *w, int *h)
}
if (desktop_window == None) {
libast_print_error("Unable to locate desktop window. If you are running Enlightenment, please\n"
- "restart. If not, please set your background image with Esetroot, then try again.");
+ "restart. If not, please set your background image with Esetroot, then try again.\n"
+ "Or, if you are running Enlightenment DR17, use e17setroot.");
return 0;
}
if (desktop_pixmap == None) {

36
x11/eterm/patches/patch-src_system.c
View File

@ -1,36 +0,0 @@
--- src/system.c.orig Wed Oct 27 18:44:06 1999
+++ src/system.c Thu Mar 7 20:46:30 2002
@@ -67,8 +67,16 @@ system_wait(char *command)
D_OPTIONS(("system_wait(%s) called.\n", command));
if (!(pid = fork())) {
+#ifdef HAVE_SETEUID
+ seteuid(my_ruid);
+#else
setreuid(my_ruid, my_ruid);
+#endif
+#ifdef HAVE_SETEGID
+ setegid(my_rgid);
+#else
setregid(my_rgid, my_rgid);
+#endif
execl("/bin/sh", "sh", "-c", command, (char *) NULL);
print_error("system_wait(): execl(%s) failed -- %s", command, strerror(errno));
exit(EXIT_FAILURE);
@@ -87,8 +95,16 @@ system_no_wait(char *command)
D_OPTIONS(("system_no_wait(%s) called.\n", command));
if (!(pid = fork())) {
+#ifdef HAVE_SETEUID
+ seteuid(my_ruid);
+#else
setreuid(my_ruid, my_ruid);
+#endif
+#ifdef HAVE_SETEGID
+ setegid(my_rgid);
+#else
setregid(my_rgid, my_rgid);
+#endif
execl("/bin/sh", "sh", "-c", command, (char *) NULL);
print_error("system_no_wait(): execl(%s) failed -- %s", command, strerror(errno));
exit(EXIT_FAILURE);

20
x11/eterm/patches/patch-src_system_c Normal file
View File

@ -0,0 +1,20 @@
$OpenBSD: patch-src_system_c,v 1.1 2007/11/18 12:55:58 jasper Exp $
--- src/system.c.orig Wed Nov 14 17:23:12 2007
+++ src/system.c Wed Nov 14 17:24:12 2007
@@ -99,8 +99,16 @@ system_no_wait(char *command)
D_OPTIONS(("system_no_wait(%s) called.\n", command));
if (!(pid = fork())) {
+#ifdef HAVE_SETEUID
+ seteuid(my_ruid);
+#else
setreuid(my_ruid, my_ruid);
+#endif
+#ifdef HAVE_SETEGID
+ setegid(my_rgid);
+#else
setregid(my_rgid, my_rgid);
+#endif
execl("/bin/sh", "sh", "-c", command, (char *) NULL);
libast_print_error("execl(%s) failed -- %s\n", command, strerror(errno));
exit(EXIT_FAILURE);

78
x11/eterm/patches/patch-src_utmp.c
View File

@ -1,78 +0,0 @@
--- src/utmp.c.orig Wed Sep 29 18:16:31 1999
+++ src/utmp.c Thu Mar 7 20:46:30 2002
@@ -68,7 +68,7 @@ static const char cvs_ident[] = "$Id: ut
#ifdef HAVE_LASTLOG_H
# include <lastlog.h>
#endif
-#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__bsdi__)
+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__bsdi__)
# include <ttyent.h>
#endif
@@ -273,7 +273,7 @@ cleanutent(void)
#else /* USE_SYSV_UTMP */
/* BSD utmp support */
-#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__bsdi__)
+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__bsdi__)
/* used to hold the line we are using */
static char ut_line[32];
@@ -321,7 +321,7 @@ b_login(struct utmp *ut)
}
}
-#else /* __FreeBSD__ || NetBSD || BSDI */
+#else /* __FreeBSD__ || __NetBSD__ || __OpenBSD__ || __bsdi__ */
static int utmp_pos = 0; /* position of utmp-stamp */
/*----------------------------------------------------------------------*
@@ -379,7 +379,7 @@ write_utmp(struct utmp *putmp)
return rval;
}
-#endif /* __FreeBSD__ || NetBSD || BSDI */
+#endif
/*
* make a utmp entry
@@ -402,7 +402,7 @@ makeutent(const char *pty, const char *h
return;
}
-#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__bsdi__)
+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__bsdi__)
strncpy(ut_line, pty, 31);
strncpy(utmp.ut_line, pty, UT_LINESIZE);
@@ -411,7 +411,7 @@ makeutent(const char *pty, const char *h
utmp.ut_time = time(NULL);
b_login(&utmp);
-#else /* __FreeBSD__ || NetBSD || BSDI */
+#else /* __FreeBSD__ || __NetBSD__ || __OpenBSD__ || __bsdi__ */
strncpy(utmp.ut_line, ut_id, sizeof(utmp.ut_line));
strncpy(utmp.ut_name, pwent->pw_name, sizeof(utmp.ut_name));
strncpy(utmp.ut_host, hostname, sizeof(utmp.ut_host));
@@ -428,10 +428,10 @@ makeutent(const char *pty, const char *h
void
cleanutent(void)
{
-#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__bsdi__)
+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__bsdi__)
logout(ut_line);
logwtmp(ut_line, "", "");
-#else /* __FreeBSD__ */
+#else /* __FreeBSD__ || __NetBSD__ || __OpenBSD__ || __bsdi__ */
FILE *fd;
privileges(INVOKE);
@@ -445,7 +445,7 @@ cleanutent(void)
fclose(fd);
}
privileges(REVERT);
-#endif /* __FreeBSD__ || NetBSD || BSDI */
+#endif
}
#endif /* USE_SYSV_UTMP */

14
x11/eterm/patches/patch-themes_Makefile_in
View File

@ -1,14 +0,0 @@
$OpenBSD: patch-themes_Makefile_in,v 1.1 2002/03/07 20:00:19 espie Exp $
--- themes/Makefile.in.orig Thu Mar 7 20:49:14 2002
+++ themes/Makefile.in Thu Mar 7 20:49:22 2002
@@ -225,8 +225,8 @@ install-data-hook:
echo "ALERT! Not overwriting theme $$i in $(DESTDIR)$(pkgdatadir)/themes. You will need to update this theme manually." ; \
fi ; \
done
- @if test ! -f $(HOME)/.active.tags ; then $(CP) $(srcdir)/active.tags $(HOME)/.active.tags ; \
- else echo "Not installing $(HOME)/.active.tags -- File exists." ; fi
+# @if test ! -f $(HOME)/.active.tags ; then $(CP) $(srcdir)/active.tags $(HOME)/.active.tags ; \
+# else echo "Not installing $(HOME)/.active.tags -- File exists." ; fi
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.

6
x11/eterm/pkg/DESCR
View File

@ -1,3 +1,3 @@
Eterm is a color vt102 terminal emulator, with support for
transparency and theme support, amongst other things. It runs
best under Enlightment, though it works just about anywhere.
Eterm is a color vt102 terminal emulator, with support for transparency
and theme support, amongst other things. It runs best under Enlightment,
though it works just about anywhere.

3
x11/eterm/pkg/PFRAG.shared
View File

@ -1,3 +1,2 @@
@comment $OpenBSD: PFRAG.shared,v 1.3 2005/12/25 21:14:26 naddy Exp $
@comment $OpenBSD: PFRAG.shared,v 1.4 2007/11/18 12:55:58 jasper Exp $
@lib lib/libEterm.so.${LIBEterm_VERSION}
@lib lib/libmej.so.${LIBmej_VERSION}

261
x11/eterm/pkg/PLIST
View File

@ -1,61 +1,244 @@
@comment $OpenBSD: PLIST,v 1.7 2004/09/18 13:19:26 espie Exp $
@comment $OpenBSD: PLIST,v 1.8 2007/11/18 12:55:58 jasper Exp $
@conflict ja-eterm-*
@conflict eterm-*
%%SHARED%%
bin/Esetroot
bin/Etbg
bin/Etcolors.sh
bin/Etbg_update_list
bin/Etcolors
@mode 4755
bin/Eterm
@mode
bin/Etmenu.sh
bin/Etsearch
bin/Ettable
bin/kEsetroot
lib/libEterm.a
lib/libEterm.la
lib/libmej.a
lib/libmej.la
@man man/man1/Eterm.1
share/Eterm/
share/Eterm/gdb.scr
share/Eterm/pix/
share/Eterm/pix/014.png
share/Eterm/pix/40.png
share/Eterm/pix/6.png
share/Eterm/pix/backwave.jpg
share/Eterm/pix/circuit.png
share/Eterm/pix/fourthday.jpg
share/Eterm/pix/gaia.jpg
share/Eterm/pix/galleon.jpg
share/Eterm/pix/nebula.jpg
share/Eterm/pix/night_of_the_dragon.jpg
share/Eterm/pix/bar_horizontal_1.png
share/Eterm/pix/bar_horizontal_2.png
share/Eterm/pix/bar_horizontal_3.png
share/Eterm/pix/bar_vertical_1.png
share/Eterm/pix/bar_vertical_2.png
share/Eterm/pix/bar_vertical_3.png
share/Eterm/pix/button_arrow_down_1.png
share/Eterm/pix/button_arrow_down_2.png
share/Eterm/pix/button_arrow_down_3.png
share/Eterm/pix/button_arrow_up_1.png
share/Eterm/pix/button_arrow_up_2.png
share/Eterm/pix/button_arrow_up_3.png
share/Eterm/pix/exit.png
share/Eterm/pix/help.png
share/Eterm/pix/menu1.png
share/Eterm/pix/menu2.png
share/Eterm/pix/menu3.png
share/Eterm/pix/pixmaps.list
share/Eterm/pix/scale/
share/Eterm/pix/scale/Bladerunner-bg.png
share/Eterm/pix/scale/Building.jpg
share/Eterm/pix/scale/Canyon.jpg
share/Eterm/pix/scale/Cavefire-bg.png
share/Eterm/pix/scale/Daughter.jpg
share/Eterm/pix/scale/Dragon.jpg
share/Eterm/pix/scale/Evocation.jpg
share/Eterm/pix/scale/Gas_Station.jpg
share/Eterm/pix/scale/Hall_of_Mirrors.jpg
share/Eterm/pix/scale/Neopolis-horizon.jpg
share/Eterm/pix/scale/Neopolis-horizon.png
share/Eterm/pix/scale/Piramid.jpg
share/Eterm/pix/scale/Snow.jpg
share/Eterm/pix/scale/Terraforming.jpg
share/Eterm/pix/scale/The_Castle.jpg
share/Eterm/pix/scale/The_New_Base.jpg
share/Eterm/pix/scale/after_the_storm.jpg
share/Eterm/pix/scale/alien_spheres.jpg
share/Eterm/pix/scale/ascension.png
share/Eterm/pix/scale/atlantis.jpg
share/Eterm/pix/scale/back1.jpg
share/Eterm/pix/scale/back3.jpg
share/Eterm/pix/scale/beacon2.jpg
share/Eterm/pix/scale/before_the_storm.jpg
share/Eterm/pix/scale/bluerising.jpg
share/Eterm/pix/scale/castle_verde.jpg
share/Eterm/pix/scale/chamelea.jpg
share/Eterm/pix/scale/citidel.jpg
share/Eterm/pix/scale/city3.jpg
share/Eterm/pix/scale/class_m.jpg
share/Eterm/pix/scale/conjunction.jpg
share/Eterm/pix/scale/coup_de_grace.jpg
share/Eterm/pix/scale/crater_lake.jpg
share/Eterm/pix/scale/cronus.jpg
share/Eterm/pix/scale/distant_kin.jpg
share/Eterm/pix/scale/dvxvb.jpg
share/Eterm/pix/scale/elysium.jpg
share/Eterm/pix/scale/enclosure.jpg
share/Eterm/pix/scale/fossil.jpg
share/Eterm/pix/scale/fourthday.jpg
share/Eterm/pix/scale/gaia.jpg
share/Eterm/pix/scale/gaia_station.jpg
share/Eterm/pix/scale/galleon.jpg
share/Eterm/pix/scale/gazebo.jpg
share/Eterm/pix/scale/good_morning_sunshine.jpg
share/Eterm/pix/scale/gorgon.jpg
share/Eterm/pix/scale/holding.jpg
share/Eterm/pix/scale/hour.jpg
share/Eterm/pix/scale/hubbles_doorstep.jpg
share/Eterm/pix/scale/icemoon.jpg
share/Eterm/pix/scale/inlet.jpg
share/Eterm/pix/scale/iron_temple.jpg
share/Eterm/pix/scale/kingdom.jpg
share/Eterm/pix/scale/lake_of_fire.jpg
share/Eterm/pix/scale/legacy.jpg
share/Eterm/pix/scale/lighthouse.jpg
share/Eterm/pix/scale/lotus.jpg
share/Eterm/pix/scale/nebula.jpg
share/Eterm/pix/scale/neopolis.jpg
share/Eterm/pix/scale/night_of_the_dragon.jpg
share/Eterm/pix/scale/night_watchman.jpg
share/Eterm/pix/scale/nocturne.jpg
share/Eterm/pix/scale/observation_deck.jpg
share/Eterm/pix/scale/planeta.png
share/Eterm/pix/scale/pond.png
share/Eterm/pix/scale/portal.jpg
share/Eterm/pix/scale/poseidon.png
share/Eterm/pix/scale/return_to_giza.jpg
share/Eterm/pix/scale/ripple.png
share/Eterm/pix/scale/rising.jpg
share/Eterm/pix/scale/river_of_lead.jpg
share/Eterm/pix/scale/roche_limit.jpg
share/Eterm/pix/scale/sentinel.jpg
share/Eterm/pix/scale/silence.jpg
share/Eterm/pix/scale/sleepwalker.jpg
share/Eterm/pix/scale/still_life_study.jpg
share/Eterm/pix/scale/sun.png
share/Eterm/pix/scale/the_forest_queen.jpg
share/Eterm/pix/scale/the_taken_field.jpg
share/Eterm/pix/scale/traveller.jpg
share/Eterm/pix/scale/trinity.jpg
share/Eterm/pix/scale/tunnel.jpg
share/Eterm/pix/scale/unfriendly_terrain.jpg
share/Eterm/pix/scale/urmane1.jpg
share/Eterm/pix/scale/urmane2.jpg
share/Eterm/pix/scale/urmane3.jpg
share/Eterm/pix/scale/urmane4.jpg
share/Eterm/pix/scale/wasteland.jpg
share/Eterm/pix/thumb_1.png
share/Eterm/pix/thumb_2.png
share/Eterm/pix/tile/
share/Eterm/pix/tile/004.png
share/Eterm/pix/tile/014.png
share/Eterm/pix/tile/015.png
share/Eterm/pix/tile/017.png
share/Eterm/pix/tile/021.png
share/Eterm/pix/tile/024.png
share/Eterm/pix/tile/026.png
share/Eterm/pix/tile/033.png
share/Eterm/pix/tile/15.png
share/Eterm/pix/tile/22.png
share/Eterm/pix/tile/35.png
share/Eterm/pix/tile/36.png
share/Eterm/pix/tile/4.png
share/Eterm/pix/tile/40.png
share/Eterm/pix/tile/43.png
share/Eterm/pix/tile/45.png
share/Eterm/pix/tile/47.png
share/Eterm/pix/tile/50.png
share/Eterm/pix/tile/53.png
share/Eterm/pix/tile/54.png
share/Eterm/pix/tile/55.png
share/Eterm/pix/tile/59.png
share/Eterm/pix/tile/6.png
share/Eterm/pix/tile/7.png
share/Eterm/pix/tile/70s_marble.png
share/Eterm/pix/tile/7m.png
share/Eterm/pix/tile/a10.png
share/Eterm/pix/tile/a2.png
share/Eterm/pix/tile/a8.png
share/Eterm/pix/tile/atoms.png
share/Eterm/pix/tile/atoms2.png
share/Eterm/pix/tile/backwave.jpg
share/Eterm/pix/tile/blackstone.png
share/Eterm/pix/tile/blue_marble.png
share/Eterm/pix/tile/blue_maze.png
share/Eterm/pix/tile/blue_rock.png
share/Eterm/pix/tile/blue_sandpaper.png
share/Eterm/pix/tile/blue_water.png
share/Eterm/pix/tile/blue_weave.png
share/Eterm/pix/tile/blurock.png
share/Eterm/pix/tile/bow-tiles.png
share/Eterm/pix/tile/brushed_aluminum.png
share/Eterm/pix/tile/button1.jpg
share/Eterm/pix/tile/button5.jpg
share/Eterm/pix/tile/c0de.jpg
share/Eterm/pix/tile/circuit.jpg
share/Eterm/pix/tile/circuit.png
share/Eterm/pix/tile/coarse_red.png
share/Eterm/pix/tile/coral3.png
share/Eterm/pix/tile/coral4.png
share/Eterm/pix/tile/corrugated_metal.png
share/Eterm/pix/tile/cyber_bg.png
share/Eterm/pix/tile/dark_marble.png
share/Eterm/pix/tile/dirt.png
share/Eterm/pix/tile/ether.png
share/Eterm/pix/tile/ether_blue.png
share/Eterm/pix/tile/ether_green.png
share/Eterm/pix/tile/firering.png
share/Eterm/pix/tile/fond_mau.png
share/Eterm/pix/tile/giger1.png
share/Eterm/pix/tile/giger2.png
share/Eterm/pix/tile/green_stucco.png
share/Eterm/pix/tile/greenred.png
share/Eterm/pix/tile/greybg.png
share/Eterm/pix/tile/lava2.png
share/Eterm/pix/tile/lightb1.png
share/Eterm/pix/tile/maple1.png
share/Eterm/pix/tile/money2.png
share/Eterm/pix/tile/money3.png
share/Eterm/pix/tile/moss.png
share/Eterm/pix/tile/multicolor1_dots.png
share/Eterm/pix/tile/multicolor3_rock.png
share/Eterm/pix/tile/nebula.jpg
share/Eterm/pix/tile/pebble1.png
share/Eterm/pix/tile/plants.png
share/Eterm/pix/tile/pool_blue.png
share/Eterm/pix/tile/purpgls.png
share/Eterm/pix/tile/purple_marble2.png
share/Eterm/pix/tile/purple_stuff.png
share/Eterm/pix/tile/qube25p.png
share/Eterm/pix/tile/red_rock.png
share/Eterm/pix/tile/red_stucco.png
share/Eterm/pix/tile/redgray_marble.png
share/Eterm/pix/tile/shale.png
share/Eterm/pix/tile/sky2.png
share/Eterm/pix/tile/soft.png
share/Eterm/pix/tile/soft_blue.png
share/Eterm/pix/tile/space.png
share/Eterm/pix/tile/starry.png
share/Eterm/pix/tile/strands1.png
share/Eterm/pix/tile/waves.png
share/Eterm/pix/tile/woodish1.png
share/Eterm/pix/tile/wtrstone.jpg
share/Eterm/themes/
share/Eterm/themes/Escreen/
share/Eterm/themes/Escreen/menus.cfg
share/Eterm/themes/Escreen/pixmaps.list
share/Eterm/themes/Escreen/theme.cfg
share/Eterm/themes/Eterm/
share/Eterm/themes/Eterm/Eterm.menu
share/Eterm/themes/Eterm/MAIN
share/Eterm/themes/Eterm/menus.cfg
share/Eterm/themes/Eterm/pixmaps.list
share/Eterm/themes/chooser/
share/Eterm/themes/chooser/MAIN
share/Eterm/themes/chooser/chooser.menu
share/Eterm/themes/chooser/pixmaps.list
share/Eterm/themes/emacs/
share/Eterm/themes/emacs/MAIN
share/Eterm/themes/emacs/emacs.menu
share/Eterm/themes/emacs/pixmaps.list
share/Eterm/themes/irc/
share/Eterm/themes/irc/MAIN
share/Eterm/themes/irc/irc.menu
share/Eterm/themes/irc/pixmaps.list
share/Eterm/themes/mutt/
share/Eterm/themes/mutt/MAIN
share/Eterm/themes/mutt/mutt.menu
share/Eterm/themes/mutt/pixmaps.list
share/Eterm/themes/tn3270/
share/Eterm/themes/tn3270/MAIN
share/Eterm/themes/tn3270/pixmaps.list
share/Eterm/themes/Eterm/theme.cfg
share/Eterm/themes/auto/
share/Eterm/themes/auto/menus.cfg
share/Eterm/themes/auto/pixmaps.list
share/Eterm/themes/auto/theme.cfg
share/Eterm/themes/trans/
share/Eterm/themes/trans/MAIN
share/Eterm/themes/trans/menus.cfg
share/Eterm/themes/trans/pixmaps.list
share/Eterm/themes/trans/trans.menu
share/Eterm/themes/trans/theme.cfg
share/doc/Eterm/
share/doc/Eterm/Eterm.tcap
share/doc/Eterm/Eterm.ti
share/doc/Eterm/ReleaseNotes
%%SHARED%%