View Issue Details [ Jump to Notes ]

Project

Tags

No tags attached.

cmlibarchive_without_getNNN_r.patch [^] (4,468 bytes) 2010-09-02 09:52 [Show Content] [Hide Content]

diff -rub cmake-2.8.2_orig/Utilities/cmlibarchive/CMakeLists.txt cmake-2.8.2_patched/Utilities/cmlibarchive/CMakeLists.txt
--- cmake-2.8.2_orig/Utilities/cmlibarchive/CMakeLists.txt	Mon Jun 28 17:16:06 2010
+++ cmake-2.8.2_patched/Utilities/cmlibarchive/CMakeLists.txt	Thu Sep  2 14:29:32 2010
@@ -372,6 +372,10 @@
 CHECK_FUNCTION_EXISTS_GLIBC(ftruncate HAVE_FTRUNCATE)
 CHECK_FUNCTION_EXISTS_GLIBC(futimes HAVE_FUTIMES)
 CHECK_FUNCTION_EXISTS_GLIBC(geteuid HAVE_GETEUID)
+CHECK_FUNCTION_EXISTS_GLIBC(getgrgid_r HAVE_GETGRGID_R)
+CHECK_FUNCTION_EXISTS_GLIBC(getgrnam_r HAVE_GETGRNAM_R)
+CHECK_FUNCTION_EXISTS_GLIBC(getpwnam_r HAVE_GETPWNAM_R)
+CHECK_FUNCTION_EXISTS_GLIBC(getpwuid_r HAVE_GETPWUID_R)
 CHECK_FUNCTION_EXISTS_GLIBC(getpid HAVE_GETPID)
 CHECK_FUNCTION_EXISTS_GLIBC(lchflags HAVE_LCHFLAGS)
 CHECK_FUNCTION_EXISTS_GLIBC(lchmod HAVE_LCHMOD)
diff -rub cmake-2.8.2_orig/Utilities/cmlibarchive/libarchive/archive_read_disk_set_standard_lookup.c cmake-2.8.2_patched/Utilities/cmlibarchive/libarchive/archive_read_disk_set_standard_lookup.c
--- cmake-2.8.2_orig/Utilities/cmlibarchive/libarchive/archive_read_disk_set_standard_lookup.c	Mon Jun 28 17:16:06 2010
+++ cmake-2.8.2_patched/Utilities/cmlibarchive/libarchive/archive_read_disk_set_standard_lookup.c	Thu Sep  2 12:51:08 2010
@@ -186,6 +186,7 @@
             &lookup_uname_helper, (id_t)uid));
 }
 
+#if HAVE_GETPWUID_R
 static const char *
 lookup_uname_helper(struct name_cache *cache, id_t id)
 {
@@ -226,7 +227,21 @@
 
     return strdup(result->pw_name);
 }
+#else
+static const char *
+lookup_uname_helper(struct name_cache *cache, id_t id)
+{
+	struct passwd	*result;
 
+	result = getpwuid((uid_t)id);
+
+	if (result == NULL)
+		return (NULL);
+
+	return strdup(result->pw_name);
+}
+#endif
+
 static const char *
 lookup_gname(void *data, gid_t gid)
 {
@@ -235,6 +250,7 @@
             &lookup_gname_helper, (id_t)gid));
 }
 
+#if HAVE_GETGRGID_R
 static const char *
 lookup_gname_helper(struct name_cache *cache, id_t id)
 {
@@ -273,4 +289,19 @@
 
     return strdup(result->gr_name);
 }
+#else
+static const char *
+lookup_gname_helper(struct name_cache *cache, id_t id)
+{
+	struct group	*result;
+
+	result = getgrgid((gid_t)id);
+
+	if (result == NULL)
+		return (NULL);
+
+	return strdup(result->gr_name);
+}
+#endif
+
 #endif /* ! (_WIN32 && !__CYGWIN__) */
diff -rub cmake-2.8.2_orig/Utilities/cmlibarchive/libarchive/archive_write_disk_set_standard_lookup.c cmake-2.8.2_patched/Utilities/cmlibarchive/libarchive/archive_write_disk_set_standard_lookup.c
--- cmake-2.8.2_orig/Utilities/cmlibarchive/libarchive/archive_write_disk_set_standard_lookup.c	Mon Jun 28 17:16:06 2010
+++ cmake-2.8.2_patched/Utilities/cmlibarchive/libarchive/archive_write_disk_set_standard_lookup.c	Thu Sep  2 14:38:47 2010
@@ -121,6 +121,7 @@
     /* Note: If strdup fails, that's okay; we just won't cache. */
     b->hash = h;
 #if HAVE_GRP_H
+#  if HAVE_GETGRNAM_R
     {
         char _buffer[128];
         size_t bufsize = 128;
@@ -129,7 +130,7 @@
         int r;
 
         for (;;) {
-            result = &grent; /* Old getgrnam_r ignores last argument.  */
+			result = &grent; /* Old getgrnam_r ignores last arg. */
 			r = getgrnam_r(gname, &grent, buffer, bufsize, &result);
 			if (r == 0)
 				break;
@@ -147,6 +148,15 @@
 		if (buffer != _buffer)
 			free(buffer);
 	}
+#  else /* HAVE_GETGRNAM_R */
+	{
+		struct group *result;
+
+		result = getgrnam(gname);
+		if (result != NULL)
+			gid = result->gr_gid;
+	}
+#  endif /* HAVE_GETGRNAM_R */
 #elif defined(_WIN32) && !defined(__CYGWIN__)
     /* TODO: do a gname->gid lookup for Windows. */
 #else
@@ -181,6 +191,7 @@
     /* Note: If strdup fails, that's okay; we just won't cache. */
     b->hash = h;
 #if HAVE_PWD_H
+#  if HAVE_GETPWNAM_R
     {
         char _buffer[128];
         size_t bufsize = 128;
@@ -189,7 +200,7 @@
         int r;
 
         for (;;) {
-            result = &pwent; /* Old getpwnam_r ignores last argument.  */
+			result = &pwent; /* Old getpwnam_r ignores last arg. */
 			r = getpwnam_r(uname, &pwent, buffer, bufsize, &result);
 			if (r == 0)
 				break;
@@ -207,6 +218,15 @@
 		if (buffer != _buffer)
 			free(buffer);
 	}
+#  else /* HAVE_GETPWNAM_R */
+	{
+		struct passwd *result;
+
+		result = getpwnam(uname);
+		if (result != NULL)
+			uid = result->pw_uid;
+	}
+#endif	/* HAVE_GETPWNAM_R */
 #elif defined(_WIN32) && !defined(__CYGWIN__)
     /* TODO: do a uname->uid lookup for Windows. */
 #else

cmlibarchive_without_getNNN_r-2.patch [^] (5,579 bytes) 2010-09-03 01:56 [Show Content] [Hide Content]

diff -rub cmake-2.8.2_orig/Utilities/cmlibarchive/CMakeLists.txt cmake-2.8.2_patched/Utilities/cmlibarchive/CMakeLists.txt
--- cmake-2.8.2_orig/Utilities/cmlibarchive/CMakeLists.txt	Mon Jun 28 17:16:06 2010
+++ cmake-2.8.2_patched/Utilities/cmlibarchive/CMakeLists.txt	Thu Sep  2 14:29:32 2010
@@ -372,6 +372,10 @@
 CHECK_FUNCTION_EXISTS_GLIBC(ftruncate HAVE_FTRUNCATE)
 CHECK_FUNCTION_EXISTS_GLIBC(futimes HAVE_FUTIMES)
 CHECK_FUNCTION_EXISTS_GLIBC(geteuid HAVE_GETEUID)
+CHECK_FUNCTION_EXISTS_GLIBC(getgrgid_r HAVE_GETGRGID_R)
+CHECK_FUNCTION_EXISTS_GLIBC(getgrnam_r HAVE_GETGRNAM_R)
+CHECK_FUNCTION_EXISTS_GLIBC(getpwnam_r HAVE_GETPWNAM_R)
+CHECK_FUNCTION_EXISTS_GLIBC(getpwuid_r HAVE_GETPWUID_R)
 CHECK_FUNCTION_EXISTS_GLIBC(getpid HAVE_GETPID)
 CHECK_FUNCTION_EXISTS_GLIBC(lchflags HAVE_LCHFLAGS)
 CHECK_FUNCTION_EXISTS_GLIBC(lchmod HAVE_LCHMOD)
diff -rub cmake-2.8.2_orig/Utilities/cmlibarchive/build/cmake/config.h.in cmake-2.8.2_patched/Utilities/cmlibarchive/build/cmake/config.h.in
--- cmake-2.8.2_orig/Utilities/cmlibarchive/build/cmake/config.h.in	Mon Jun 28 17:16:06 2010
+++ cmake-2.8.2_patched/Utilities/cmlibarchive/build/cmake/config.h.in	Fri Sep  3 07:27:48 2010
@@ -181,6 +181,18 @@
 /* Define to 1 if you have the `geteuid' function. */
 #cmakedefine HAVE_GETEUID 1
 
+/* Define to 1 if you have the `getgrgid_r' function. */
+#cmakedefine HAVE_GETGRGID_R 1
+
+/* Define to 1 if you have the `getgrnam_r' function. */
+#cmakedefine HAVE_GETGRNAM_R 1
+
+/* Define to 1 if you have the `getpwnam_r' function. */
+#cmakedefine HAVE_GETPWNAM_R 1
+
+/* Define to 1 if you have the `getpwuid_r' function. */
+#cmakedefine HAVE_GETPWUID_R 1
+
 /* Define to 1 if you have the `getpid' function. */
 #cmakedefine HAVE_GETPID 1
 
diff -rub cmake-2.8.2_orig/Utilities/cmlibarchive/libarchive/archive_read_disk_set_standard_lookup.c cmake-2.8.2_patched/Utilities/cmlibarchive/libarchive/archive_read_disk_set_standard_lookup.c
--- cmake-2.8.2_orig/Utilities/cmlibarchive/libarchive/archive_read_disk_set_standard_lookup.c	Mon Jun 28 17:16:06 2010
+++ cmake-2.8.2_patched/Utilities/cmlibarchive/libarchive/archive_read_disk_set_standard_lookup.c	Thu Sep  2 12:51:08 2010
@@ -186,6 +186,7 @@
             &lookup_uname_helper, (id_t)uid));
 }
 
+#if HAVE_GETPWUID_R
 static const char *
 lookup_uname_helper(struct name_cache *cache, id_t id)
 {
@@ -226,7 +227,21 @@
 
     return strdup(result->pw_name);
 }
+#else
+static const char *
+lookup_uname_helper(struct name_cache *cache, id_t id)
+{
+    struct passwd   *result;
 
+    result = getpwuid((uid_t)id);
+
+    if (result == NULL)
+        return (NULL);
+
+    return strdup(result->pw_name);
+}
+#endif
+
 static const char *
 lookup_gname(void *data, gid_t gid)
 {
@@ -235,6 +250,7 @@
             &lookup_gname_helper, (id_t)gid));
 }
 
+#if HAVE_GETGRGID_R
 static const char *
 lookup_gname_helper(struct name_cache *cache, id_t id)
 {
@@ -273,4 +289,19 @@
 
     return strdup(result->gr_name);
 }
+#else
+static const char *
+lookup_gname_helper(struct name_cache *cache, id_t id)
+{
+    struct group    *result;
+
+    result = getgrgid((gid_t)id);
+
+    if (result == NULL)
+        return (NULL);
+
+    return strdup(result->gr_name);
+}
+#endif
+
 #endif /* ! (_WIN32 && !__CYGWIN__) */
diff -rub cmake-2.8.2_orig/Utilities/cmlibarchive/libarchive/archive_write_disk_set_standard_lookup.c cmake-2.8.2_patched/Utilities/cmlibarchive/libarchive/archive_write_disk_set_standard_lookup.c
--- cmake-2.8.2_orig/Utilities/cmlibarchive/libarchive/archive_write_disk_set_standard_lookup.c	Mon Jun 28 17:16:06 2010
+++ cmake-2.8.2_patched/Utilities/cmlibarchive/libarchive/archive_write_disk_set_standard_lookup.c	Thu Sep  2 14:38:47 2010
@@ -121,6 +121,7 @@
     /* Note: If strdup fails, that's okay; we just won't cache. */
     b->hash = h;
 #if HAVE_GRP_H
+#  if HAVE_GETGRNAM_R
     {
         char _buffer[128];
         size_t bufsize = 128;
@@ -129,7 +130,7 @@
         int r;
 
         for (;;) {
-            result = &grent; /* Old getgrnam_r ignores last argument.  */
+            result = &grent; /* Old getgrnam_r ignores last arg. */
             r = getgrnam_r(gname, &grent, buffer, bufsize, &result);
             if (r == 0)
                 break;
@@ -147,6 +148,15 @@
         if (buffer != _buffer)
             free(buffer);
     }
+#  else /* HAVE_GETGRNAM_R */
+    {
+        struct group *result;
+
+        result = getgrnam(gname);
+        if (result != NULL)
+            gid = result->gr_gid;
+    }
+#  endif /* HAVE_GETGRNAM_R */
 #elif defined(_WIN32) && !defined(__CYGWIN__)
     /* TODO: do a gname->gid lookup for Windows. */
 #else
@@ -181,6 +191,7 @@
     /* Note: If strdup fails, that's okay; we just won't cache. */
     b->hash = h;
 #if HAVE_PWD_H
+#  if HAVE_GETPWNAM_R
     {
         char _buffer[128];
         size_t bufsize = 128;
@@ -189,7 +200,7 @@
         int r;
 
         for (;;) {
-            result = &pwent; /* Old getpwnam_r ignores last argument.  */
+            result = &pwent; /* Old getpwnam_r ignores last arg. */
             r = getpwnam_r(uname, &pwent, buffer, bufsize, &result);
             if (r == 0)
                 break;
@@ -207,6 +218,15 @@
         if (buffer != _buffer)
             free(buffer);
     }
+#  else /* HAVE_GETPWNAM_R */
+    {
+        struct passwd *result;
+
+        result = getpwnam(uname);
+        if (result != NULL)
+            uid = result->pw_uid;
+    }
+#endif  /* HAVE_GETPWNAM_R */
 #elif defined(_WIN32) && !defined(__CYGWIN__)
     /* TODO: do a uname->uid lookup for Windows. */
 #else

Relationships

Notes
(0021708) Bill Hoffman (manager) 2010-08-11 10:41	Please try git master or next of CMake. We now have a dashboard for OpenBSD, and have done the porting work. What version of CMake are you using?

(0021726) Mihai (reporter) 2010-08-12 03:29	version of cmake that I tried to install is 2.8.2. Should I try with git master?

(0021727) Bill Hoffman (manager) 2010-08-12 08:07	Yes, try git master or git next.

(0021740) Matthias (reporter) 2010-08-13 07:16	Tried to compile git master of CMake on OpenBSD 3.9, but make failed with the same error. OpenBSD does not provide getpwuid_r until Version 4.4. Is there maybe a configure switch to CMake? Version 2.6.4 compiles just fine.

(0021773) Bill Hoffman (manager) 2010-08-16 10:23	OK, we are only nightly testing on OpenBSD 4.6 (i386)-gcc 4.2.4-gmake. If you want to provide a patch that would be good. We don't have access to a 3.9 machine.

(0021890) Mihai (reporter) 2010-08-23 08:02	And how can I help?

(0021893) Bill Hoffman (manager) 2010-08-23 10:46	Create a patch and run a nightly dashboard.

(0022073) Matthias (reporter) 2010-09-02 09:52	Comparing the included Utilities/cmlibarchive/libarchive/archive_read_disk_set_standard_lookup.c (where the error seems to happen) to the same file in the standalone libarchive, I found that some preprocessor instructions and code for handling systems without getpwuid_r (and similar functions) had been removed, together with the corresponding instructions in CMakeLists.txt. Patching the lines from the standalone libarchive into cmlibarchive seems to solve the problem. But I'm no C-programmer and so I cannot tell for what reason this code had been removed or if reinserting it will have some side effects. I attached a patch against the 2.8.2-release.

(0022074) Bill Hoffman (manager) 2010-09-02 12:39	the new try-compile results need to be referenced in build/cmake/config.h.in so that they are visible in the source. Can you add that part to the patch and attach a new patch?

(0022080) Matthias (reporter) 2010-09-03 02:12	Hmm, I'm not sure, what you mean, but I took a diff between libarchive-2.8.4/build/cmake/config.h.in and cmake-2.8.2/Utilities/cmlibarchive/build/cmake/config.h.in. Then I copied the lines, which seemed relevant. Attached new patch cmlibarchive_without_getNNN_r-2.patch (As you can see, this is really not my area of expertise and I'm heavily relying on the Frankenstein-approach.)

(0022475) Mihai (reporter) 2010-10-12 04:03	The patch provided by Matthias is working very well.

(0022477) Bill Hoffman (manager) 2010-10-12 10:08	Can either of you run a nightly dashboard on this system? I would like to make sure it keeps on working. Thanks.

(0022491) Matthias (reporter) 2010-10-14 03:55	Ok. I'm still not sure what exactly a "nightly dashboard" is, but looking into the wiki I figured it may have to do something with the nightly and/or dashboard branches of the git-tree. So I did the following: # # unfortunately there is no git available on the system in question: # cvs -d :pserver:anonymous@cmake.org:/cmake.git co -d CMake nightly # cd CMake # patch -p1 cmlibarchive_without_getNNN_r-2.patch # CXXFLAGS="${CXXFLAGS} -pthread" \ > CC=/opt/gcc-4.2.4/bin/gcc \ > CXX="/opt/gcc-4.2.4/bin/g++" \ > ./configure --no-qt-gui --prefix=/tmp/test/cm-n-gcc42 # make # make install Everything worked like intended: The patch applied without even a warning. Configure and make also completed successfully # /tmp/test/cm-n-gcc42/bin/cmake --version cmake version 2.8.2.20101012-cvs-nightly For testing I built the (also patched) 2.8.2 realease of cmake # tar xfz cmake-2.8.2.tar.gz # cd cmake-2.8.2 # patch -p1 cmlibarchive_without_getNNN_r-2.patch # CXXFLAGS="${CXXFLAGS} -pthread" \ > CC=/opt/gcc-4.2.4/bin/gcc \ > CXX="/opt/gcc-4.2.4/bin/g++" \ > /tmp/test/cm-n-gcc42/bin/cmake . # make # bin/cmake --version cmake verison 2.8.2 So it seems to be working just fine. I hope this is what you asked for. Thanks.

(0022492) Bill Hoffman (manager) 2010-10-14 09:44	by nightly dashboard, I mean a cronjob on your machine that builds CMake from git next once a day. For instructions see here: http://www.cmake.org/cmake/resources/testing.html [^] I want to make sure that your work is not "undone" by someone in the future.

(0031867) Amit Kulkarni (reporter) 2012-12-11 14:48	can you close this? openbsd 3.9 was released may 1, 2006, cmake since then works on openbsd... won't fix

(0039081) Robert Maynard (manager) 2015-07-08 08:57	Closing resolved issues that have not been updated in more than 4 months.

Issue History
Date Modified	Username	Field	Change
2010-08-11 10:12	Mihai	New Issue
2010-08-11 10:41	Bill Hoffman	Note Added: 0021708
2010-08-11 10:41	Bill Hoffman	Status	new => assigned
2010-08-11 10:41	Bill Hoffman	Assigned To	=> Bill Hoffman
2010-08-12 03:29	Mihai	Note Added: 0021726
2010-08-12 08:07	Bill Hoffman	Note Added: 0021727
2010-08-13 07:16	Matthias	Note Added: 0021740
2010-08-16 10:23	Bill Hoffman	Note Added: 0021773
2010-08-23 08:02	Mihai	Note Added: 0021890
2010-08-23 10:46	Bill Hoffman	Note Added: 0021893
2010-09-02 09:52	Matthias	Note Added: 0022073
2010-09-02 09:52	Matthias	File Added: cmlibarchive_without_getNNN_r.patch
2010-09-02 12:39	Bill Hoffman	Note Added: 0022074
2010-09-03 01:56	Matthias	File Added: cmlibarchive_without_getNNN_r-2.patch
2010-09-03 02:12	Matthias	Note Added: 0022080
2010-10-12 04:03	Mihai	Note Added: 0022475
2010-10-12 10:08	Bill Hoffman	Note Added: 0022477
2010-10-14 03:55	Matthias	Note Added: 0022491
2010-10-14 09:44	Bill Hoffman	Note Added: 0022492
2012-12-11 14:48	Amit Kulkarni	Note Added: 0031867
2015-02-26 16:23	Stephen Kelly	Status	assigned => resolved
2015-02-26 16:23	Stephen Kelly	Resolution	open => no change required
2015-07-08 08:57	Robert Maynard	Note Added: 0039081
2015-07-08 08:57	Robert Maynard	Status	resolved => closed