| 1 |
dilfridge 12/01/01 12:22:57 |
| 2 |
|
| 3 |
Added: kmuddy-1.0.1-tempnam.patch |
| 4 |
kmuddy-1.0.1-underlinking.patch |
| 5 |
Log: |
| 6 |
Fix underlinking and tempnam failure so pkgmask can be lifted again; bug 371451 |
| 7 |
|
| 8 |
(Portage version: 2.1.10.41/cvs/Linux x86_64) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.1 games-mud/kmuddy/files/kmuddy-1.0.1-tempnam.patch |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-mud/kmuddy/files/kmuddy-1.0.1-tempnam.patch?rev=1.1&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-mud/kmuddy/files/kmuddy-1.0.1-tempnam.patch?rev=1.1&content-type=text/plain |
| 15 |
|
| 16 |
Index: kmuddy-1.0.1-tempnam.patch |
| 17 |
=================================================================== |
| 18 |
--- plugins/scripting/cunixsocket.cpp |
| 19 |
+++ plugins/scripting/cunixsocket.cpp |
| 20 |
@@ -40,12 +40,21 @@ |
| 21 |
varlist = 0; |
| 22 |
connected = false; |
| 23 |
|
| 24 |
- //first of all, we need a file name |
| 25 |
- char *fname = tempnam ("/tmp", "km"); |
| 26 |
- if (fname != 0) //only if it didn't fail |
| 27 |
+ //22 = strlen(form) + strlen(/sock) + 1 |
| 28 |
+ char form[]="/tmp/kmuddyXXXXXX", *dirname, sockname[22]; |
| 29 |
+ dirname = mkdtemp(form); |
| 30 |
+ |
| 31 |
+ if (dirname != NULL) //only if it didn't fail |
| 32 |
{ |
| 33 |
- name = fname; |
| 34 |
- free (fname); |
| 35 |
+ |
| 36 |
+ strcpy(sockname, dirname); |
| 37 |
+ strcat(dirname, "/sock"); |
| 38 |
+ |
| 39 |
+ name = dirname; |
| 40 |
+ free (form); |
| 41 |
+ free (dirname); |
| 42 |
+ free (sockname); |
| 43 |
+ |
| 44 |
//now that we have the name, we create a socket and set some parameters |
| 45 |
id = socket (PF_UNIX, SOCK_STREAM, 0); |
| 46 |
sa.sun_family = AF_UNIX; |
| 47 |
|
| 48 |
|
| 49 |
|
| 50 |
1.1 games-mud/kmuddy/files/kmuddy-1.0.1-underlinking.patch |
| 51 |
|
| 52 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-mud/kmuddy/files/kmuddy-1.0.1-underlinking.patch?rev=1.1&view=markup |
| 53 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-mud/kmuddy/files/kmuddy-1.0.1-underlinking.patch?rev=1.1&content-type=text/plain |
| 54 |
|
| 55 |
Index: kmuddy-1.0.1-underlinking.patch |
| 56 |
=================================================================== |
| 57 |
diff -ruN kmuddy-1.0.1.orig/kmuddy/CMakeLists.txt kmuddy-1.0.1/kmuddy/CMakeLists.txt |
| 58 |
--- kmuddy-1.0.1.orig/kmuddy/CMakeLists.txt 2009-03-14 13:24:55.000000000 +0100 |
| 59 |
+++ kmuddy-1.0.1/kmuddy/CMakeLists.txt 2012-01-01 11:40:31.000000000 +0100 |
| 60 |
@@ -49,7 +49,7 @@ |
| 61 |
|
| 62 |
kde4_add_executable(kmuddy ${kmuddy_SRCS}) |
| 63 |
|
| 64 |
-set (KMUDDY_LIBRARIES kmuddycore dialogs ${KDE4_KDECORE_LIBS} ${KDE4_KPARTS_LIBS} ${KDE4_KUTILS_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_PHONON_LIBS} ${KDE4_KDE3SUPPORT_LIBS}) |
| 65 |
+set (KMUDDY_LIBRARIES kmuddycore dialogs ${KDE4_KDECORE_LIBS} ${KDE4_KPARTS_LIBS} ${KDE4_KUTILS_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_PHONON_LIBS} ${KDE4_KDE3SUPPORT_LIBS} z) |
| 66 |
|
| 67 |
if (MXP_FOUND) |
| 68 |
set (KMUDDY_LIBRARIES ${KMUDDY_LIBRARIES} ${MXP_LIBRARIES}) |
| 69 |
diff -ruN kmuddy-1.0.1.orig/plugins/mapper/plugins/speedwalk/CMakeLists.txt kmuddy-1.0.1/plugins/mapper/plugins/speedwalk/CMakeLists.txt |
| 70 |
--- kmuddy-1.0.1.orig/plugins/mapper/plugins/speedwalk/CMakeLists.txt 2009-01-10 12:40:59.000000000 +0100 |
| 71 |
+++ kmuddy-1.0.1/plugins/mapper/plugins/speedwalk/CMakeLists.txt 2012-01-01 13:15:35.000000000 +0100 |
| 72 |
@@ -17,7 +17,7 @@ |
| 73 |
|
| 74 |
kde4_add_plugin(kmuddymapper_speedwalk WITH_PREFIX ${kmuddymapper_speedwalk_PART_SRCS}) |
| 75 |
|
| 76 |
-target_link_libraries(kmuddymapper_speedwalk ${KDE4_KDECORE_LIBS} ${KDE4_KPARTS_LIBS} ${KDE4_KDE3SUPPORT_LIBS} kmuddymapper ) |
| 77 |
+target_link_libraries(kmuddymapper_speedwalk kmuddymapper kmuddycore ${KDE4_KDECORE_LIBS} ${KDE4_KPARTS_LIBS} ${KDE4_KDE3SUPPORT_LIBS} ) |
| 78 |
|
| 79 |
install(TARGETS kmuddymapper_speedwalk DESTINATION ${PLUGIN_INSTALL_DIR} ) |
Archives