From 53086a5b031adb264f21b39d31630f605d19f6be Mon Sep 17 00:00:00 2001
From: Mario Fetka <mario.fetka@gmail.com>
Date: Sun, 13 Nov 2011 21:50:34 +0100
Subject: [PATCH] correct bug
 https://bugzilla.novell.com/show_bug.cgi?id=692201

---
 CMakeLists.txt     | 29 ++++++++++++++---------------
 include/emutli.h   |  2 +-
 src/CMakeLists.txt |  6 +++---
 3 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 378b123..4982c37 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -12,10 +12,9 @@ SET (VERSION_SUB "0")
 SET (VERSION_DEVEL "0")
 SET (VERSION_SUFFIX ".0")
 
-SET (VERSION_PATCH "${VERSION_PATCH}${VERSION_SUFFIX}")
 
 IF (VERSION_SUB)
-    SET (VERSION_PATCH "${VERSION_PATCH}.${VERSION_SUB}${VERSION_SUFFIX}")
+    SET (VERSION_PATCH "${VERSION_PATCH}${VERSION_SUFFIX}")
 ENDIF (VERSION_SUB)
 
 IF (VERSION_DEVEL)
@@ -36,7 +35,7 @@ INCLUDE(${CMAKE_MODULE_PATH}/MarsNweInstallDirs.cmake)
 # Add options for build
 option(ENABLE_DEBUG "Should we build with Debug?" ON)
 option(ENABLE_DEBUG_DOSUTILS "Should we build with Mars Nwe Dosutils Debugging?" OFF)
-option(ENABLE_INTERNAL_RIP_SAP "Should we build Mars Nwe with Internal Router?" OFF)
+option(ENABLE_INTERNAL_RIP_SAP "Should we build Mars Nwe with Internal Router?" ON)
 option(ENABLE_SHADOW_PWD "Should we build Mars Nwe with Shadow Password Support?" ON)
 option(ENABLE_QUOTA_SUPPORT "Should we build Mars Nwe with Quota Support?" OFF)
 
@@ -125,15 +124,15 @@ add_subdirectory(sys)
 add_subdirectory(dosutils)
 add_subdirectory(mail)
 
-#SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Common Authentication Service Adapter (CASA).")
-#SET(CPACK_PACKAGE_VENDOR "http://code.google.com/p/casa-auth/")
-#SET(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README")
-#SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/COPYING")
-#set(CPACK_PACKAGE_VERSION_MAJOR "${VERSION_MAJOR}")
-#set(CPACK_PACKAGE_VERSION_MINOR "${VERSION_MINOR}")
-#set(CPACK_PACKAGE_VERSION_PATCH "pl${VERSION_PATCH}")
-#set(CPACK_SOURCE_GENERATOR "TBZ2")
-#SET(CPACK_PACKAGE_INSTALL_DIRECTORY "mars_nwe-${VERSION}")
-#SET(CPACK_SOURCE_IGNORE_FILES CMakeCache.txt CMakeFiles progress.make cmake_install.cmake CPackConfig.cmake CPackSourceConfig.cmake "\\\\.git" "\\\\.svn" "\\\\.swp$" "\\\\.cvs" "\\\\.tar.gz" "\\\\.o")
-#set(CPACK_SOURCE_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME}-${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
-#include(CPack)
+SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "MARtin Stovers NetWare-Emulator.")
+SET(CPACK_PACKAGE_VENDOR "http://www.compu-art.de/mars_nwe/")
+SET(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README")
+SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/COPYING")
+set(CPACK_PACKAGE_VERSION_MAJOR "${VERSION_MAJOR}")
+set(CPACK_PACKAGE_VERSION_MINOR "${VERSION_MINOR}")
+set(CPACK_PACKAGE_VERSION_PATCH "pl${VERSION_PATCH}")
+set(CPACK_SOURCE_GENERATOR "TBZ2")
+SET(CPACK_PACKAGE_INSTALL_DIRECTORY "mars_nwe-${VERSION}")
+SET(CPACK_SOURCE_IGNORE_FILES CMakeCache.txt CMakeFiles progress.make cmake_install.cmake CPackConfig.cmake CPackSourceConfig.cmake "\\\\.git" "\\\\.svn" "\\\\.swp$" "\\\\.cvs" "\\\\.tar.gz" "\\\\.o")
+set(CPACK_SOURCE_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME}-${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
+include(CPack)
diff --git a/include/emutli.h b/include/emutli.h
index 6752810..a545dcd 100644
--- a/include/emutli.h
+++ b/include/emutli.h
@@ -44,7 +44,7 @@
 
 typedef unsigned char       uint8;
 typedef unsigned short int uint16;
-typedef unsigned long  int uint32;
+typedef unsigned int       uint32;
 
 #define IPX_NET_SIZE    4
 #define IPX_NODE_SIZE   6
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 0bb2779..0abe02a 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -16,9 +16,9 @@ if (CMAKE_SYSTEM_NAME MATCHES Linux)
 endif (CMAKE_SYSTEM_NAME MATCHES Linux)
 
 add_definitions(
-        -D_VERS_H_=\"${VERSION_MAJOR}\"
-        -D_VERS_L_=\"${VERSION_MINOR}\"
-        -D_VERS_P_=\"${VERSION_PATCH}\"
+        -D_VERS_H_=${VERSION_MAJOR}
+        -D_VERS_L_=${VERSION_MINOR}
+        -D_VERS_P_=${VERSION_PATCH}
     )
 
 IF(ENABLE_QUOTA_SUPPORT)