Hello community,
here is the log from the commit of package tmate for openSUSE:Factory checked
in at 2019-10-17 12:21:39
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/tmate (Old)
and /work/SRC/openSUSE:Factory/.tmate.new.2352 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "tmate"
Thu Oct 17 12:21:39 2019 rev:4 rq:738819 version:2.3.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/tmate/tmate.changes 2019-08-05
10:36:28.863333863 +0200
+++ /work/SRC/openSUSE:Factory/.tmate.new.2352/tmate.changes 2019-10-17
12:21:42.823258929 +0200
@@ -1,0 +2,6 @@
+Mon Oct 14 13:05:33 UTC 2019 - Andreas Schneider <a...@cryptomilk.org>
+
+- Update to 2.3.1
+ - Allow the use of C.UTF-8 locale
+
+-------------------------------------------------------------------
Old:
----
tmate-2.3.0.tar.gz
New:
----
tmate-2.3.1.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ tmate.spec ++++++
--- /var/tmp/diff_new_pack.O98PG8/_old 2019-10-17 12:21:43.547257112 +0200
+++ /var/tmp/diff_new_pack.O98PG8/_new 2019-10-17 12:21:43.551257102 +0200
@@ -17,7 +17,7 @@
Name: tmate
-Version: 2.3.0
+Version: 2.3.1
Release: 0
Summary: Instant terminal sharing
License: MIT
++++++ tmate-2.3.0.tar.gz -> tmate-2.3.1.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/tmate-2.3.0/.travis.yml new/tmate-2.3.1/.travis.yml
--- old/tmate-2.3.0/.travis.yml 2019-08-01 03:02:18.000000000 +0200
+++ new/tmate-2.3.1/.travis.yml 2019-10-13 03:10:03.000000000 +0200
@@ -1,10 +1,36 @@
language: c
+services:
+- docker
+
matrix:
- include:
- - compiler: gcc
- - compiler: clang
- env: CFLAGS="-g -O2"
-before_install:
- - sudo apt-get update -qq
- - sudo apt-get -y install debhelper autotools-dev dh-autoreconf file
libncurses5-dev libevent-dev pkg-config libutempter-dev build-essential
-script: (CFLAGS= ./autogen.sh) && ./configure --enable-debug && make
+ include:
+ - arch: amd64
+ env: PLATFORM=amd64
+ - arch: amd64
+ env: PLATFORM=i386
+ - arch: arm64
+ env: PLATFORM=arm32v6
+ - arch: arm64
+ env: PLATFORM=arm32v7
+ - arch: arm64
+ env: PLATFORM=arm64v8
+
+script:
+- 'docker build . --tag local-$PLATFORM/tmate-build --build-arg
PLATFORM=$PLATFORM'
+# On arch=arm64, some directories are not setup correctly, and 'ruby -S gem
+# install dpl' required by the release push scripts fails.
+- 'if [ "$TRAVIS_TAG" ]; then sudo chown -R $USER: /var/lib/gems
/usr/local/bin; fi'
+- 'if [ "$TRAVIS_TAG" ]; then ./package_release.sh $TRAVIS_TAG $PLATFORM; fi'
+
+deploy:
+ provider: releases
+ api_key:
+ secure:
T2109tjjOsrVLEpJZK/uxmO0AuDGXYFdN4AAsNTmVwu/W5dcX57Kk2TCgqDuLfD21iGGXP0U/OYHM06IfBDODBWCA9P8ASHYsenS7wIiFnvCEMbfzoAFyBMrXN2kNdM2+ho3aqc0xE2lQKOKDLxpGm5FZrzujscXXzxQjWBU5Hk=
+ skip_cleanup: true
+ overwrite: true
+ file_glob: true
+ file: /tmp/tmate-release/*.tar.*
+ on:
+ repo: tmate-io/tmate
+ branch: master
+ tags: true
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/tmate-2.3.0/Dockerfile new/tmate-2.3.1/Dockerfile
--- old/tmate-2.3.0/Dockerfile 1970-01-01 01:00:00.000000000 +0100
+++ new/tmate-2.3.1/Dockerfile 2019-10-13 03:10:03.000000000 +0200
@@ -0,0 +1,28 @@
+ARG PLATFORM=amd64
+FROM ${PLATFORM}/alpine:3.10
+
+WORKDIR /build
+
+RUN apk add --no-cache wget cmake make gcc g++ linux-headers zlib-dev
openssl-dev \
+ automake autoconf libevent-dev ncurses-dev msgpack-c-dev
libexecinfo-dev \
+ ncurses-static libexecinfo-static libevent-static msgpack-c
ncurses-libs \
+ libevent libexecinfo openssl zlib
+
+RUN set -ex; \
+ mkdir -p /src/libssh/build; \
+ cd /src; \
+ wget -O libssh.tar.xz
https://www.libssh.org/files/0.9/libssh-0.9.0.tar.xz; \
+ tar -xf libssh.tar.xz -C /src/libssh --strip-components=1; \
+ cd /src/libssh/build; \
+ cmake -DCMAKE_INSTALL_PREFIX:PATH=/usr \
+ -DWITH_SFTP=OFF -DWITH_SERVER=OFF -DWITH_PCAP=OFF \
+ -DWITH_STATIC_LIB=ON -DWITH_GSSAPI=OFF ..; \
+ make -j $(nproc); \
+ make install
+
+COPY . .
+
+RUN ./autogen.sh && ./configure --enable-static
+RUN make -j $(nproc)
+RUN strip tmate
+RUN ./tmate -V
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/tmate-2.3.0/Makefile.static-build
new/tmate-2.3.1/Makefile.static-build
--- old/tmate-2.3.0/Makefile.static-build 2019-08-01 03:02:18.000000000
+0200
+++ new/tmate-2.3.1/Makefile.static-build 1970-01-01 01:00:00.000000000
+0100
@@ -1,61 +0,0 @@
-LIBSSH=libssh-0.7.2
-LIBSSH_URL=https://red.libssh.org/attachments/download/177/$(LIBSSH).tar.xz
-LIBSSH_LIB=ext/lib/libssh.a
-
-MSGPACK=msgpack-1.3.0
-MSGPACK_URL=https://github.com/msgpack/msgpack-c/releases/download/cpp-1.3.0/$(MSGPACK).tar.gz
-MSGPACK_LIB=ext/lib/libmsgpack.a
-
-TMATE_CONFIGURE=PKG_CONFIG_PATH=./ext/lib/pkgconfig
-
-LIBC=$(shell gcc -print-file-name=libc.a)
-STATIC_LIBC_OBJECTS=fdelt_chk
-STATIC_COMPAT_OBJECTS=memcpy clock_gettime
-
-all: tmate
-
-dependencies:
- apt-get install build-essential cmake libssl-dev autoconf automake
pkg-config libtool libevent-dev libncurses-dev zlib1g-dev
-
-downloads/$(notdir $(LIBSSH_URL)):
- mkdir -p downloads
- wget -O $@ $(LIBSSH_URL)
-
-$(LIBSSH)/.ready: downloads/$(notdir $(LIBSSH_URL))
- tar xf $<
- touch $@
-
-downloads/$(notdir $(MSGPACK_URL)):
- mkdir -p downloads
- wget -O $@ $(MSGPACK_URL)
-
-$(MSGPACK)/.ready: downloads/$(notdir $(MSGPACK_URL))
- tar xf $<
- touch $@
-
-$(LIBSSH_LIB): $(LIBSSH)/.ready
- mkdir -p $(LIBSSH)/build
- cd $(LIBSSH)/build; ([ -f Makefile ] || cmake
-DCMAKE_INSTALL_PREFIX:PATH=$(shell pwd)/ext .. -DWITH_SFTP=OFF
-DWITH_SERVER=OFF -DWITH_PCAP=OFF -DWITH_STATIC_LIB=ON -DWITH_GSSAPI=OFF)
- +make -C $(LIBSSH)/build install
-
-$(MSGPACK_LIB): $(MSGPACK)/.ready
- mkdir -p $(MSGPACK)/build
- cd $(MSGPACK)/build; ([ -f Makefile ] || cmake
-DCMAKE_INSTALL_PREFIX:PATH=$(shell pwd)/ext ..)
- +make -C $(MSGPACK)/build install
-
-libc/%.o:
- mkdir -p libc
- cd libc; ar x $(LIBC) $(notdir $@)
-
-compat/%.o: compat/%.c
- gcc -c -o $@ $<
-
-tmate: $(MSGPACK_LIB) $(LIBSSH_LIB) $(patsubst
%,libc/%.o,$(STATIC_LIBC_OBJECTS)) $(patsubst
%,compat/%.o,$(STATIC_COMPAT_OBJECTS))
- ./autogen.sh
- $(TMATE_CONFIGURE) ./configure --enable-static
- +make
- strip tmate
-
-clean:
- rm -rf ext libc $(LIBSSH) $(MSGPACK)
- +make clean
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/tmate-2.3.0/compat/clock_gettime.c
new/tmate-2.3.1/compat/clock_gettime.c
--- old/tmate-2.3.0/compat/clock_gettime.c 2019-08-01 03:02:18.000000000
+0200
+++ new/tmate-2.3.1/compat/clock_gettime.c 1970-01-01 01:00:00.000000000
+0100
@@ -1,9 +0,0 @@
-#define _GNU_SOURCE
-#include <time.h>
-#include <unistd.h>
-#include <sys/syscall.h>
-
-int clock_gettime(clockid_t clk_id, struct timespec *tp)
-{
- return syscall(SYS_clock_gettime, clk_id, tp);
-}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/tmate-2.3.0/compat/memcpy.c
new/tmate-2.3.1/compat/memcpy.c
--- old/tmate-2.3.0/compat/memcpy.c 2019-08-01 03:02:18.000000000 +0200
+++ new/tmate-2.3.1/compat/memcpy.c 1970-01-01 01:00:00.000000000 +0100
@@ -1,11 +0,0 @@
-//
http://stackoverflow.com/questions/8823267/linking-against-older-symbol-version-in-a-so-file
-
-#include <string.h>
-
-/* some systems do not have newest memcpy@@GLIBC_2.14 - stay with old good one
*/
-asm (".symver memcpy, memcpy@GLIBC_2.2.5");
-
-void *__wrap_memcpy(void *dest, const void *src, size_t n)
-{
- return memcpy(dest, src, n);
-}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/tmate-2.3.0/configure.ac new/tmate-2.3.1/configure.ac
--- old/tmate-2.3.0/configure.ac 2019-08-01 03:02:18.000000000 +0200
+++ new/tmate-2.3.1/configure.ac 2019-10-13 03:10:03.000000000 +0200
@@ -1,6 +1,6 @@
# configure.ac
-AC_INIT(tmate, 2.3.0)
+AC_INIT(tmate, 2.3.1)
AC_CONFIG_AUX_DIR(etc)
AM_INIT_AUTOMAKE([foreign subdir-objects])
@@ -47,10 +47,11 @@
found_static=$enable_static
)
if test "x$found_static" = xyes; then
+ # XXX Static build are only doable with the musl library
PKG_CONFIG="pkg-config --static"
CFLAGS="$CFLAGS -flto"
- LDFLAGS="$LDFLAGS -flto"
+ LDFLAGS="$LDFLAGS -flto -static -no-pie"
PKG_CHECK_MODULES([ZLIB], [zlib], [
CPPFLAGS="$ZLIB_CFLAGS $CPPFLAGS"
@@ -61,7 +62,6 @@
CPPFLAGS="$LIBCRYPTO_CFLAGS $CPPFLAGS"
LIBS="$LIBCRYPTO_LIBS $LIBS"
])
- # See more static settings below... (search for found_static)
fi
# Is this gcc?
@@ -462,17 +462,6 @@
fi
AM_CONDITIONAL(NO_GETOPT, [test "x$found_getopt" = xno])
-if test "x$found_static" = xyes; then
- # libc and libdl should be dynamically linked.
- # but we want to lower our requirements for libc's version.
- # so we extract some symobls and add them here
- if test `uname -m` = x86_64; then
- LIBS="compat/memcpy.o -Wl,--wrap=memcpy $LIBS"
- fi
- LIBS="compat/clock_gettime.o libc/fdelt_chk.o $LIBS"
- LIBS="-Wl,-Bstatic ${LIBS/-ldl/} -Wl,-Bdynamic -ldl"
-fi
-
# Check for BSD-style integer types.
AC_MSG_CHECKING(for BSD-style unsigned types)
AC_COMPILE_IFELSE([AC_LANG_SOURCE(
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/tmate-2.3.0/package_release.sh
new/tmate-2.3.1/package_release.sh
--- old/tmate-2.3.0/package_release.sh 1970-01-01 01:00:00.000000000 +0100
+++ new/tmate-2.3.1/package_release.sh 2019-10-13 03:10:03.000000000 +0200
@@ -0,0 +1,14 @@
+#!/bin/bash
+set -eux
+VERSION=$1
+PLATFORM=$2
+RELEASE_NAME=tmate-$VERSION-static-linux-$PLATFORM
+
+# This assumes the follow command has already been run:
+# docker build . --tag local-$PLATFORM/tmate-build --build-arg
PLATFORM=$PLATFORM
+
+mkdir -p /tmp/tmate-release/$RELEASE_NAME
+cd /tmp/tmate-release
+docker run --rm local-$PLATFORM/tmate-build cat tmate > $RELEASE_NAME/tmate
+chmod +x $RELEASE_NAME/tmate
+tar -cf - $RELEASE_NAME | xz > tmate-$VERSION-static-linux-$PLATFORM.tar.xz
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/tmate-2.3.0/server.c new/tmate-2.3.1/server.c
--- old/tmate-2.3.0/server.c 2019-08-01 03:02:18.000000000 +0200
+++ new/tmate-2.3.1/server.c 2019-10-13 03:10:03.000000000 +0200
@@ -205,10 +205,6 @@
status_prompt_load_history();
-#ifdef TMATE
- tmate_write_ready();
-#endif
-
server_add_accept(0);
proc_loop(server_proc, server_loop);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/tmate-2.3.0/tmate-session.c
new/tmate-2.3.1/tmate-session.c
--- old/tmate-2.3.0/tmate-session.c 2019-08-01 03:02:18.000000000 +0200
+++ new/tmate-2.3.1/tmate-session.c 2019-10-13 03:10:03.000000000 +0200
@@ -138,6 +138,7 @@
* - While we are parsing the config file, we need to be able to
* serialize it, and so we need a worker encoder.
*/
+ tmate_write_ready();
lookup_and_connect();
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/tmate-2.3.0/tmux.c new/tmate-2.3.1/tmux.c
--- old/tmate-2.3.0/tmux.c 2019-08-01 03:02:18.000000000 +0200
+++ new/tmate-2.3.1/tmux.c 2019-10-13 03:10:03.000000000 +0200
@@ -205,12 +205,12 @@
const char *s;
int opt, flags, keys;
- if (setlocale(LC_CTYPE, "en_US.UTF-8") == NULL) {
+ if (setlocale(LC_CTYPE, "en_US.UTF-8") == NULL &&
+ setlocale(LC_CTYPE, "C.UTF-8") == NULL) {
if (setlocale(LC_CTYPE, "") == NULL)
errx(1, "invalid LC_ALL, LC_CTYPE or LANG");
s = nl_langinfo(CODESET);
- if (strcasecmp(s, "UTF-8") != 0 &&
- strcasecmp(s, "UTF8") != 0)
+ if (strcasecmp(s, "UTF-8") != 0 && strcasecmp(s, "UTF8") != 0)
errx(1, "need UTF-8 locale (LC_CTYPE) but have %s", s);
}
