Changeset 901

Timestamp:

Apr 1, 2016, 5:22:52 PM (10 years ago)

Author:

Silvan Scherrer

Message:

samba server: remove -Zbin-files, open needed files as O_BINARY, fix version string in build.cmd

Location:

trunk/server

Files:

• lib/tdb/common/open.c (modified) (1 diff)
• lib/util/util_file.c (modified) (1 diff)
• source3/build.cmd (modified) (7 diffs)
• source3/version.os2_ (modified) (1 diff)

trunk/server/lib/tdb/common/open.c

@@ -217 +217 @@
         tdb->map_ptr = NULL;
         tdb->flags = tdb_flags;
+
+
+
         tdb->open_flags = open_flags;
         if (log_ctx) {

trunk/server/lib/util/util_file.c

@@ -203 +203 @@
         if (!fname || !*fname) return NULL;
         
+
+
+
         fd = open(fname,O_RDONLY);
+
         if (fd == -1) return NULL;
 

trunk/server/source3/build.cmd

@@ -79 +79 @@
  *   - added lxlite and emxomfstripe
  *   - rename some variables eCS vs OS/2
+
+
+
 */
 
@@ -89 +92 @@
 
 /* init the version string (don't forget to change) */
-version      = "1.1.0"
-version_date = "24.03.2016"
+version      = "1.1."
+version_date = ".2016"
 
 '@echo off'
@@ -281 +284 @@
             parse var OS2Ver.I . '='vendor_suffix
             vendor_suffix = strip(vendor_suffix,,'"')
-            parse var vendor_suffix vendor suffix
         end
         if left(OS2Ver.I,14) = "MAINTAINED_BY=" then do
             parse var OS2Ver.I . '='maintainedBy
             maintainedBy = '"Maintained by: ' || strip(maintainedBy,,'"') || '"'
+
+
+
+
         end
     end
@@ -295 +301 @@
     OS2Ver.0 = I
 
+
+
+
+
     do until lines(VERSION) = 0
         verline = linein(VERSION)
@@ -310 +320 @@
             parse var OS2Ver.I tag'='strvalue
             parse var verline stag'=' .
+
+
+
             if stag = tag then do
                 verline = tag'='strvalue
@@ -321 +334 @@
     ok = stream(newVersion,'c','close')
     address cmd "sh ./script/mkversion.sh "newVersion" >NUL"
-    verstring = suffix'-'Major'.'minor'.'release'.'revision'-'vendor'-'date('S')
+    verstring = -'date('S')
     say 'Samba branded as: '
     say '"'verstring'"'
@@ -338 +351 @@
     call lineout scriptfile, "CXXFLAGS='-O2 -g -march=pentium'";
     call lineout scriptfile, "export CXXFLAGS";
-    call lineout scriptfile, "LDFLAGS=' -Zhigh-mem -Zomf -Zargs-wild -Zargs-resp -Zbin-files'";
+    call lineout scriptfile, "LDFLAGS=' -Zhigh-mem -Zomf -Zargs-wild -Zargs-resp'";
     call lineout scriptfile, "export LDFLAGS";
     call lineout scriptfile, "LIBS='-lmmap -lintl'";

trunk/server/source3/version.os2_

@@ -1 @@
-SAMBA_VERSION_VENDOR_SUFFIX="OS/2 and OS/2-based systems v1.3.0"
+SAMBA_VERSION_VENDOR_SUFFIX="OS/2 and OS/2-based systems"
+VENDOR_VERSION="1.3.0"
 MAINTAINED_BY="unknown"