OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 15-Oct-2006 12:57:05
Branch: HEAD Handle: 2006101511570500
Modified files:
openpkg-src/opie opie.patch opie.spec
Log:
apply Solaris fixes from Michael Schloh and finally upgrade to at
least PLUS class
Summary:
Revision Changes Path
1.2 +102 -0 openpkg-src/opie/opie.patch
1.4 +2 -2 openpkg-src/opie/opie.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/opie/opie.patch
============================================================================
$ cvs diff -u -r1.1 -r1.2 opie.patch
--- openpkg-src/opie/opie.patch 7 Nov 2005 19:03:49 -0000 1.1
+++ openpkg-src/opie/opie.patch 15 Oct 2006 10:57:05 -0000 1.2
@@ -33,3 +33,105 @@
#include <sys/types.h>
/* Adapted from the Autoconf hypertext info pages */
#if HAVE_DIRENT_H
+Index: libopie/generator.c
+--- libopie/generator.c.orig 2006-06-18 02:06:28.215630000 +0200
++++ libopie/generator.c 2006-06-18 02:06:15.049431000 +0200
+@@ -62,7 +62,7 @@
+ static int opieauto_connect FUNCTION_NOARGS
+ {
+ int s;
+- struct sockaddr_un sun;
++ struct sockaddr_un locsun;
+ char buffer[1024];
+ char *c, *c2 ="/.opieauto";
+ uid_t myuid = getuid(), myeuid = geteuid();
+@@ -74,8 +74,8 @@
+ return -1;
+ };
+
+- memset(&sun, 0, sizeof(struct sockaddr_un));
+- sun.sun_family = AF_UNIX;
++ memset(&locsun, 0, sizeof(struct sockaddr_un));
++ locsun.sun_family = AF_UNIX;
+
+ if (!(c = getenv("HOME"))) {
+ #if DEBUG
+@@ -84,15 +84,15 @@
+ return -1;
+ };
+
+- if (strlen(c) > (sizeof(sun.sun_path) - strlen(c2) - 1)) {
++ if (strlen(c) > (sizeof(locsun.sun_path) - strlen(c2) - 1)) {
+ #if DEBUG
+ syslog(LOG_DEBUG, "opieauto_connect: HOME is too long: %s", c);
+ #endif /* DEBUG */
+ return -1;
+ };
+
+- strcpy(sun.sun_path, c);
+- strcat(sun.sun_path, c2);
++ strcpy(locsun.sun_path, c);
++ strcat(locsun.sun_path, c2);
+
+ if ((s = socket(PF_UNIX, SOCK_STREAM, 0)) < 0) {
+ #if DEBUG
+@@ -104,14 +104,14 @@
+ {
+ struct stat st;
+
+- if (stat(sun.sun_path, &st) < 0) {
++ if (stat(locsun.sun_path, &st) < 0) {
+ #if DEBUG
+ syslog(LOG_DEBUG, "opieauto_connect: stat: %s(%d)\n",
strerror(errno), errno);
+ #endif /* DEBUG */
+ goto ret;
+ };
+
+- if (connect(s, (struct sockaddr *)&sun, sizeof(struct sockaddr_un))) {
++ if (connect(s, (struct sockaddr *)&locsun, sizeof(struct sockaddr_un)))
{
+ #if DEBUG
+ syslog(LOG_DEBUG, "opieauto_connect: connect: %s(%d)\n",
strerror(errno), errno);
+ #endif /* DEBUG */
+Index: opieauto.c
+--- opieauto.c.orig 2001-11-20 16:18:42.000000000 +0100
++++ opieauto.c 2006-06-18 02:28:20.526432000 +0200
+@@ -282,10 +282,10 @@
+ baile("atexit");
+
+ {
+- struct sockaddr_un sun;
++ struct sockaddr_un locsun;
+
+- memset(&sun, 0, sizeof(struct sockaddr_un));
+- sun.sun_family = AF_UNIX;
++ memset(&locsun, 0, sizeof(struct sockaddr_un));
++ locsun.sun_family = AF_UNIX;
+
+ {
+ char *c;
+@@ -294,12 +294,12 @@
+ if (!(c = getenv("HOME")))
+ bail("getenv(HOME) failed -- no HOME variable?");
+
+- if (strlen(c) > (sizeof(sun.sun_path) - strlen(c2) - 1))
++ if (strlen(c) > (sizeof(locsun.sun_path) - strlen(c2) - 1))
+ bail("your HOME is too long");
+
+- strcpy(sun.sun_path, c);
+- strcat(sun.sun_path, c2);
+- sockpath = strdup(sun.sun_path);
++ strcpy(locsun.sun_path, c);
++ strcat(locsun.sun_path, c2);
++ sockpath = strdup(locsun.sun_path);
+ };
+
+ if ((parents = socket(PF_UNIX, SOCK_STREAM, 0)) < 0)
+@@ -311,7 +311,7 @@
+ if (umask(0177) < 0)
+ baile("umask");
+
+- if (bind(parents, (struct sockaddr *)&sun, sizeof(struct sockaddr_un)))
++ if (bind(parents, (struct sockaddr *)&locsun, sizeof(struct
sockaddr_un)))
+ baile("bind");
+
+ if (stat(sockpath, &st) < 0)
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/opie/opie.spec
============================================================================
$ cvs diff -u -r1.3 -r1.4 opie.spec
--- openpkg-src/opie/opie.spec 13 Oct 2006 17:31:05 -0000 1.3
+++ openpkg-src/opie/opie.spec 15 Oct 2006 10:57:05 -0000 1.4
@@ -33,11 +33,11 @@
Vendor: Craig Metz
Packager: OpenPKG Foundation e.V.
Distribution: OpenPKG Community
-Class: EVAL
+Class: PLUS
Group: Cryptography
License: INL3
Version: %{V_major}.%{V_minor}
-Release: 20061013
+Release: 20061015
# list of sources
Source0:
http://www.inner.net/pub/opie/test/opie-%{V_major}-test%{V_minor}.tar.gz
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
