Changeset 778 for branches/samba-3.5.x/source3

Timestamp:

Jul 11, 2013, 6:25:21 PM (12 years ago)

Author:

Silvan Scherrer

Message:

Samba 3.5: add a maintained message

Location:

branches/samba-3.5.x/source3

Files:

• build.cmd (modified) (7 diffs)
• lib/version.c (modified) (1 diff)
• nmbd/nmbd.c (modified) (1 diff)
• script/mkversion.sh (modified) (2 diffs)
• smbd/server.c (modified) (1 diff)
• version.ec_ (modified) (1 diff)
• winbindd/winbindd.c (modified) (1 diff)

branches/samba-3.5.x/source3/build.cmd

@@ -18 +18 @@
 /* version 0.3.9 from 12.11.2012 Silvan (never use ksh, now using sh) */
 /* version 0.3.10 from 12.11.2012 Herwig (make libc switching really optional) */
+/* version 0.3.11 from 15.11.2012 Silvan (python also in unixroot) */
+/* version 0.3.12 from 30.11.2012 Silvan (maintained by) */
                                          
 /* load the sysfuncs if not already loaded */
@@ -27 +29 @@
 
 /* init the version string (don't forget to change) */
-version = "0.3.10"
-version_date = "15.11.2012"
+version = "0.3.12"
+version_date = "30.11.2012"
 
 /* number of make jobs to execute at the same time */
@@ -153 +155 @@
         end
     end
+    else do
+    sEnvVar = EnvGet('UNIXROOT');
+    if sEnvVar <> '' then do
+        sEnvVar = sEnvVar || '/usr'
+        sPythonVersion = PythonVersion(sEnvVar|| '/lib');
+        if sPythonVersion <> '-1' then do
+            call lineout cacheFile, "ac_cv_path_PYTHON_CONFIG='" || sEnvVar || "/lib/" || sPythonVersion || "'";
+            call lineout cacheFile, "ac_cv_path_PYTHON='" || sEnvVar || "/include'";
+        end
+    end
+    end
 
     ok = stream(cacheFile, 'c', 'close');
@@ -197 +210 @@
     /* eComStation Version file */
     VerFile = "VERSION.ECS"
+    maintainedBy = "unknown"
 
     /* is the file available */
@@ -219 +233 @@
             parse var vendor_suffix vendor suffix
         end
+        if left(eCSVer.I,14) = "MAINTAINED_BY=" then do
+            parse var eCSver.I . '='maintainedBy
+            maintainedBy = '"Maintained by: ' || strip(maintainedBy,,'"') || '"'
+        end
     end
     ok = stream(VerFile, 'c', 'close')
@@ -248 +266 @@
         if Verline <> "=" then call lineout NewVersion, verline
     end
+    if maintainedBy <> "" then call lineout NewVersion, "MAINTAINED_BY="maintainedBy
 
     ok = stream(Version,'c','close')
@@ -255 +274 @@
     verstring = suffix'-'Major'.'minor'.'release'.'revision'-'vendor'-'date('S')
     say "Samba branded as: "verstring
+    say maintainedBy
     say
 return

branches/samba-3.5.x/source3/lib/version.c

@@ -26 +26 @@
         return SAMBA_VERSION_STRING;
 }
+#ifdef __OS2__
+const char *maintained_by_string(void)
+{
+        return MAINTAINED_BY;
+}
+#endif

branches/samba-3.5.x/source3/nmbd/nmbd.c

@@ -876 +876 @@
         DEBUG(0,("nmbd version %s started.\n", samba_version_string()));
         DEBUGADD(0,("%s\n", COPYRIGHT_STARTUP_MESSAGE));
+#ifdef __OS2__
+        DEBUGADD(0,("%s\n", maintained_by_string()));
+#endif
 
         if (!lp_load_initial_only(get_dyn_CONFIGFILE())) {

branches/samba-3.5.x/source3/script/mkversion.sh

@@ -32 +32 @@
 
 SAMBA_VERSION_VENDOR_FUNCTION=`sed -n 's/^SAMBA_VERSION_VENDOR_FUNCTION=//p' $SOURCE_DIR$VERSION_FILE`
+MAINTAINED_BY=`sed -n 's/^MAINTAINED_BY=//p' $SOURCE_DIR$VERSION_FILE`
 
 echo "/* Autogenerated by script/mkversion.sh */" > $OUTPUT_FILE
@@ -38 +39 @@
 echo "#define SAMBA_VERSION_MINOR ${SAMBA_VERSION_MINOR}" >> $OUTPUT_FILE
 echo "#define SAMBA_VERSION_RELEASE ${SAMBA_VERSION_RELEASE}" >> $OUTPUT_FILE
-
+echo "#define MAINTAINED_BY ${MAINTAINED_BY}" >> $OUTPUT_FILE
 
 ##

branches/samba-3.5.x/source3/smbd/server.c

@@ -1153 +1153 @@
         DEBUG(0,("smbd version %s started.\n", samba_version_string()));
         DEBUGADD(0,("%s\n", COPYRIGHT_STARTUP_MESSAGE));
+#ifdef __OS2__
+        DEBUGADD(0,("%s\n", maintained_by_string()));
+#endif
 
         DEBUG(2,("uid=%d gid=%d euid=%d egid=%d\n",

branches/samba-3.5.x/source3/version.ec_

@@ -1 +1 @@
 SAMBA_VERSION_VENDOR_SUFFIX="eCS 1.2.0"
 SAMBA_VERSION_VENDOR_PATCH=432
+MAINTAINED_BY="unknown"

branches/samba-3.5.x/source3/winbindd/winbindd.c

@@ -1114 +1114 @@
         DEBUG(0,("winbindd version %s started.\n", samba_version_string()));
         DEBUGADD(0,("%s\n", COPYRIGHT_STARTUP_MESSAGE));
+#ifdef __OS2__
+        DEBUGADD(0,("%s\n", maintained_by_string()));
+#endif
 
         if (!lp_load_initial_only(get_dyn_CONFIGFILE())) {