ChangeLog

+commit ca032d147824861b2451c5b0ff715429f055cfe1
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date:   Tue Mar 6 23:09:04 2018 -0800
+
+    twm 1.0.10
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 9703527df12caf896963a0f39db79e58f2ab2bfa
+Author: Mihail Konev <k.mvc@ya.ru>
+Date:   Thu Jan 26 14:00:20 2017 +1000
+
+    autogen: add default patch prefix
+    
+    Signed-off-by: Mihail Konev <k.mvc@ya.ru>
+
+commit d58f4564f5621ec6c0e7ea6ee9d647845ac11352
+Author: Emil Velikov <emil.l.velikov@gmail.com>
+Date:   Mon Mar 9 12:00:52 2015 +0000
+
+    autogen.sh: use quoted string variables
+    
+    Place quotes around the $srcdir, $ORIGDIR and $0 variables to prevent
+    fall-outs, when they contain space.
+    
+    Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
+    Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit ca0c7a4eee66c96e6d449a58742d749c20aa494d
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Tue Jan 24 10:32:07 2017 +1000
+
+    autogen.sh: use exec instead of waiting for configure to finish
+    
+    Syncs the invocation of configure with the one from the server.
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+    Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
+
+commit c5abcb619eb0b01f074fd9acb9128f19af774834
+Author: Thomas Klausner <wiz@NetBSD.org>
+Date:   Wed Sep 23 20:53:24 2015 +0200
+
+    Adapt callers to ExpandFilename change.
+    
+    It now always allocates memory, so remove some unnecessary checks.
+    While here, improve handling of an error case.
+    
+    Signed-off-by: Thomas Klausner <wiz@NetBSD.org>
+    Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit cb5dc44303e8496450a649a97540e55887e1fe22
+Author: Christos Zoulas <christos@NetBSD.org>
+Date:   Wed Sep 23 10:57:44 2015 +0200
+
+    Add some const.
+    
+    Signed-off-by: Thomas Klausner <wiz@NetBSD.org>
+    Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit c644db2c3a1b6c9e5e99da130493a978a7d08010
+Author: Michael van Elst <mlelstv@NetBSD.org>
+Date:   Sun Jul 19 12:04:52 2015 +0200
+
+    Do not try to extend the font-pattern with a wild-card.
+    
+    This will almost always select the wrong fontset and use wrong metrics.
+    
+    Signed-off-by: Thomas Klausner <wiz@NetBSD.org>
+    Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
 commit b52e4041054b580bace70d9db5e7e3d90b33ad6d
 Author: Alan Coopersmith <alan.coopersmith@oracle.com>
 Date:   Thu Apr 16 22:36:31 2015 -0700

autogen.sh

 #! /bin/sh
 
-srcdir=`dirname $0`
+srcdir=`dirname "$0"`
 test -z "$srcdir" && srcdir=.
 
 ORIGDIR=`pwd`
-cd $srcdir
+cd "$srcdir"
 
 autoreconf -v --install || exit 1
-cd $ORIGDIR || exit $?
+cd "$ORIGDIR" || exit $?
+
+git config --local --get format.subjectPrefix >/dev/null 2>&1 ||
+    git config --local format.subjectPrefix "PATCH app/twm"
 
 if test -z "$NOCONFIGURE"; then
-    $srcdir/configure "$@"
+    exec "$srcdir"/configure "$@"
 fi

configure.ac

@@ -22,7 +22,7 @@ dnl Process this file with autoconf to create configure.
 
 # Initialize Autoconf
 AC_PREREQ([2.60])
-AC_INIT([twm], [1.0.9],
+AC_INIT([twm], [1.0.10],
         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [twm])
 AC_CONFIG_SRCDIR([Makefile.am])
 AC_CONFIG_HEADERS([config.h])

debian/README.source

@@ -47,27 +47,3 @@ are involved:
   case, it appears directly in the .diff.gz.
 * Otherwise, the patch is added to debian/patches/ which is managed
   with quilt as documented in /usr/share/doc/quilt/README.source.
-
-quilt is actually invoked by the Debian X packaging through a larger
-set of scripts called XSFBS. XSFBS brings some other X specific
-features such as managing dependencies and conflicts due to the video
-and input driver ABIs.
-XSFBS itself is maintained in a separate repository at
-  git://git.debian.org/pkg-xorg/xsfbs.git
-and it is pulled inside the other Debian X repositories when needed.
-
-The XSFBS patching system requires a build dependency on quilt. Also
-a dependency on $(STAMP_DIR)/patch has to be added to debian/rules
-so that the XSFBS patching occurs before the actual build. So the
-very first target of the build (likely the one running autoreconf)
-should depend on $(STAMP_DIR)/patch. It should also not depend on
-anything so that parallel builds are correctly supported (nothing
-should probably run while patching is being done). And finally, the
-clean target should depend on the xsfclean target so that patches
-are unapplied on clean.
-
-When the upstream sources contain some DFSG-nonfree files, they are
-listed in text files in debian/prune/ in the "debian-*" branch of
-the Debian repository. XSFBS' scripts then take care of removing
-these listed files during the build so as to generate a modified
-DFSG-free .orig.tar.gz tarball.

debian/changelog

-twm (1:1.0.9-2) UNRELEASED; urgency=medium
+twm (1:1.0.10-1) unstable; urgency=medium
 
-  * Update Vcs-* control fields to use https.
+  * Team upload.
+  * Update Vcs-* control fields to point at salsa.
   * Update www.gnu.org and xorg.freedesktop.org URLs in packaging to https.
+  * Delete XSFBS-related cruft from README.source.
+  * Update upstream git URL to point at gitlab.fdo.
+  * New upstream release
 
- -- Julien Cristau <jcristau@debian.org>  Sun, 21 Aug 2016 18:11:41 +0200
+ -- Julien Cristau <jcristau@debian.org>  Thu, 06 Sep 2018 15:16:24 +0200
 
 twm (1:1.0.9-1) unstable; urgency=medium
 

debian/control

@@ -16,8 +16,8 @@ Build-Depends:
  xutils-dev (>= 1:7.5+4),
  automake,
 Standards-Version: 3.9.1
-Vcs-Git: https://anonscm.debian.org/git/pkg-xorg/app/twm.git
-Vcs-Browser: https://anonscm.debian.org/git/pkg-xorg/app/twm.git
+Vcs-Git: https://salsa.debian.org/xorg-team/app/twm.git
+Vcs-Browser: https://salsa.debian.org/xorg-team/app/twm
 
 Package: twm
 Architecture: any

debian/watch

-#git=git://anongit.freedesktop.org/xorg/app/twm
+#git=https://gitlab.freedesktop.org/xorg/app/twm
 version=3
 opts="pgpsigurlmangle=s/$/.sig/" \
-https://xorg.freedesktop.orgreleases/individual/app/ twm-(.*)\.tar\.gz
+https://xorg.freedesktop.org/releases/individual/app/ twm-(.*)\.tar\.gz

src/menus.c

@@ -2020,7 +2020,7 @@ ExecuteFunction(int func, const char *action, Window w, TwmWindow *tmp_win,
 				 "%s:  unable to open cut file \"%s\"\n",
 				 ProgramName, tmp);
 		    }
-		    if (ptr != tmp) free (ptr);
+		    free (ptr);
 		}
 	    } else {
 		XFree(ptr);
@@ -2171,6 +2171,7 @@ ExecuteFunction(int func, const char *action, Window w, TwmWindow *tmp_win,
 
     case F_FILE:
 	ptr = ExpandFilename(action);
+	if (ptr) {
 	    fd = open(ptr, O_RDONLY);
 	    if (fd >= 0)
 	    {
@@ -2185,7 +2186,10 @@ ExecuteFunction(int func, const char *action, Window w, TwmWindow *tmp_win,
 		fprintf (stderr, "%s:  unable to open file \"%s\"\n",
 			 ProgramName, ptr);
 	    }
-	if (ptr != action) free(ptr);
+	    free(ptr);
+	} else {
+	    fprintf (stderr, "%s: error expanding filename\n", ProgramName);
+	}
 	break;
 
     case F_REFRESH:

src/util.c

@@ -256,11 +256,11 @@ Zoom(Window wf, Window wt)
  *  \param name  the filename to expand
  */
 char *
-ExpandFilename(char *name)
+ExpandFilename(const char *name)
 {
     char *newname;
 
-    if (name[0] != '~') return name;
+    if (name[0] != '~') return strdup(name);
 
     newname = malloc (HomeLen + strlen(name) + 2);
     if (!newname) {
@@ -350,7 +350,7 @@ FindBitmap (const char *name, unsigned *widthp, unsigned *heightp)
     pm = XmuLocateBitmapFile (ScreenOfDisplay(dpy, Scr->screen), bigname, NULL,
 			      0, (int *)widthp, (int *)heightp, &HotX, &HotY);
     if (pm == None && Scr->IconDirectory && bigname[0] != '/') {
-	if (bigname != name) free (bigname);
+	free (bigname);
 	/*
 	 * Attempt to find icon in old IconDirectory (now obsolete)
 	 */
@@ -367,7 +367,7 @@ FindBitmap (const char *name, unsigned *widthp, unsigned *heightp)
 	    pm = None;
 	}
     }
-    if (bigname != name) free (bigname);
+    free (bigname);
     if (pm == None) {
 	fprintf (stderr, "%s:  unable to find bitmap \"%s\"\n",
 		 ProgramName, name);
@@ -589,17 +589,13 @@ GetFont(MyFont *font)
     int ascent;
     int descent;
     int fnum;
-    char *basename2;
 
     if (use_fontset) {
 	if (font->fontset != NULL){
 	    XFreeFontSet(dpy, font->fontset);
 	}
 
-	basename2 = malloc(strlen(font->name) + 3);
-	if (basename2) sprintf(basename2, "%s,*", font->name);
-	else basename2 = font->name;
-	if( (font->fontset = XCreateFontSet(dpy, basename2,
+	if( (font->fontset = XCreateFontSet(dpy, font->name,
 					    &missing_charset_list_return,
 					    &missing_charset_count_return,
 					    &def_string_return)) == NULL) {
@@ -607,7 +603,6 @@ GetFont(MyFont *font)
 			 ProgramName, font->name);
 	    exit(1);
 	}
-	if (basename2 != font->name) free(basename2);
 	for(i=0; i<missing_charset_count_return; i++){
 	    printf("%s: warning: font for charset %s is lacking.\n",
 		   ProgramName, missing_charset_list_return[i]);

src/util.h

@@ -64,7 +64,7 @@ in this Software without prior written authorization from The Open Group.
 extern void MoveOutline ( Window root, int x, int y, int width, int height,
 			  int bw, int th );
 extern void Zoom ( Window wf, Window wt );
-extern char * ExpandFilename ( char *name );
+extern char * ExpandFilename ( const char *name );
 extern void GetUnknownIcon ( const char *name );
 extern Pixmap FindBitmap ( const char *name, unsigned int *widthp,
 			   unsigned int *heightp );