commit c3c32d9c76008fe0a5d4afd04bfb0fa5ec04feca
Author: Elan Ruusamäe <[email protected]>
Date: Thu Jan 19 11:51:59 2017 +0200
up to 4.5.0
screen-debian_fixed.patch | 24 +++++++++++-------------
screen-info.patch | 6 +++---
screen-statusline-encoding.patch | 23 ++++++++++++-----------
screen.spec | 6 +++---
4 files changed, 29 insertions(+), 30 deletions(-)
---
diff --git a/screen.spec b/screen.spec
index 5fc3632..c9ed0ef 100644
--- a/screen.spec
+++ b/screen.spec
@@ -16,12 +16,12 @@ Summary(ru.UTF-8): Менеджер экрана, поддерживающий
Summary(tr.UTF-8): Bir uçbirimde birden fazla oturumu düzenler
Summary(uk.UTF-8): Менеджер екрану, що підтримує кілька логінів з одного
терміналу
Name: screen
-Version: 4.4.0
+Version: 4.5.0
Release: 1
License: GPL v3+
Group: Applications/Terminal
Source0: http://ftp.gnu.org/gnu/screen/%{name}-%{version}.tar.gz
-# Source0-md5: d26e11a3648c2b11aaefa215a55dfd39
+# Source0-md5: a32105a91359afab1a4349209a028e31
Source1:
http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2
# Source1-md5: 236166e774cee788cf594b05dd1dd70d
Source2: %{name}.pamd
@@ -117,7 +117,7 @@ Screen корисний користувачам, які заходять на
%patch9 -p1
%patch12 -p1
#%patch13 -p1 # my brain farted here, see if you have better luck
-%patch15 -p0
+%patch15 -p1
%patch17 -p2
%patch18 -p1
%patch22 -p1
diff --git a/screen-debian_fixed.patch b/screen-debian_fixed.patch
index c9afb70..c37fe44 100644
--- a/screen-debian_fixed.patch
+++ b/screen-debian_fixed.patch
@@ -93,8 +93,8 @@
else if (ParseSaveStr(act, &BufferFile))
break;
if (msgok)
---- screen-4.1/screen.c~ 2010-02-24 14:46:32.000000000 +0200
-+++ screen-4.1/screen.c 2010-02-24 14:47:04.352924220 +0200
+--- screen-4.5.0/screen.c~ 2017-01-19 11:46:42.000000000 +0200
++++ screen-4.5.0/screen.c 2017-01-19 11:47:53.835503179 +0200
@@ -109,6 +109,7 @@
FILE *dfp;
#endif
@@ -112,27 +112,25 @@
#ifdef SHADOWPW
struct spwd *sss = NULL;
static char *spw = NULL;
-@@ -285,13 +286,18 @@
+@@ -303,11 +303,16 @@
pw_try_again:
#endif
n = 0;
+ len = 13;
- if (ppp->pw_passwd[0] == '#' && ppp->pw_passwd[1] == '#' &&
- strcmp(ppp->pw_passwd + 2, ppp->pw_name) == 0)
+ if (ppp->pw_passwd[0] == '#' && ppp->pw_passwd[1] == '#' &
strcmp(ppp->pw_passwd + 2, ppp->pw_name) == 0)
n = 13;
-- for (; n < 13; n++)
+- for (; n < 13; n++) {
+ else if (!strncmp(ppp->pw_passwd, "$1$", 3)) { /* MD5-based passwords
*/
+ n = 13;
+ len = 34;
+ }
+ for (; n < len; n++)
- {
- char c = ppp->pw_passwd[n];
-- if (!(c == '.' || c == '/' || c == '$' ||
-+ if (!(c == '.' || c == '/' || (len == 34 && c == '$') ||
- (c >= '0' && c <= '9') ||
- (c >= 'a' && c <= 'z') ||
- (c >= 'A' && c <= 'Z')))
+ char c = ppp->pw_passwd[n];
+- if (!(c == '.' || c == '/' || c == '$' ||
++ if (!(c == '.' || c == '/' || (len == 34 && c == '$') ||
+ (c >= '0' && c <= '9') ||
+ (c >= 'a' && c <= 'z') ||
+ (c >= 'A' && c <= 'Z')))
@@ -479,9 +479,6 @@
timestring = SaveStr("%c:%s %M %d %H%? %l%?");
wlisttit = SaveStr(" Num Name%=Flags");
diff --git a/screen-info.patch b/screen-info.patch
index 5d04436..e4d7e7c 100644
--- a/screen-info.patch
+++ b/screen-info.patch
@@ -1,5 +1,5 @@
---- screen-4.4.0/doc/screen.texinfo~ 2016-06-26 19:27:26.000000000 +0300
-+++ screen-4.4.0/doc/screen.texinfo 2016-06-26 19:46:48.088236448 +0300
+--- screen-4.5.0/doc/screen.texinfo~ 2017-01-19 10:24:06.000000000 +0200
++++ screen-4.5.0/doc/screen.texinfo 2017-01-19 10:24:52.417185864 +0200
@@ -3,14 +3,14 @@
@c vi:set wm=5
@setfilename screen.info
@@ -8,7 +8,7 @@
@finalout
@setchapternewpage odd
@c %**end of header
- @set version 4.4.0
+ @set version 4.5.0
+@dircategory Shell utilities:
@direntry
diff --git a/screen-statusline-encoding.patch b/screen-statusline-encoding.patch
index 3d5a258..ba7460c 100644
--- a/screen-statusline-encoding.patch
+++ b/screen-statusline-encoding.patch
@@ -1,7 +1,7 @@
https://savannah.gnu.org/bugs/index.php?23955
---- process.c.orig 2008-05-08 02:37:33.000000000 +0800
-+++ process.c 2008-05-08 02:37:49.000000000 +0800
+--- ./process.c.orig 2008-05-08 02:37:33.000000000 +0800
++++ ./process.c 2008-05-08 02:37:49.000000000 +0800
@@ -3422,6 +3422,7 @@
{
WinSwitchEncoding(fore, n);
@@ -10,12 +10,12 @@ https://savannah.gnu.org/bugs/index.php?23955
}
else if (i && display)
D_encoding = n;
---- screen.c.orig 2008-05-08 02:37:22.000000000 +0800
-+++ screen.c 2008-05-20 20:34:37.000000000 +0800
-@@ -2584,6 +2584,17 @@
- }
- p += strlen(p) - 1;
- break;
+--- screen-4.5.0/screen.c~ 2017-01-19 11:48:22.000000000 +0200
++++ screen-4.5.0/screen.c 2017-01-19 11:49:18.766380947 +0200
+@@ -2766,6 +2766,18 @@
+ p += strlen(p) - 1;
+ break;
+
+#ifdef ENCODINGS
+ case 'e':
+ *p = 0;
@@ -27,6 +27,7 @@ https://savannah.gnu.org/bugs/index.php?23955
+ p += strlen(p) - 1;
+ break;
+#endif
- case '{':
- {
- char rbuf[128];
++
+ case '{':
+ {
+ char rbuf[128];
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/screen.git/commitdiff/46910f0d452a325a12e7f9caa7f884db0e22de8e
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
