Pisilinux/core
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into kernel_4_14

Browse Source
This commit is contained in:
Ertuğrul Erata
2018-12-22 18:37:53 +03:00
parent ac864a549e 529e0aca4d
commit 6576345561
54 changed files with 24090 additions and 14302 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kernel/drivers/module-virtualbox-guest/actions.py
+1 -1
View File
@@ -11,7 +11,7 @@ KDIR = kerneltools.getKernelVersion()
def build():
autotools.make("KERN_DIR=/lib/modules/%s/build" % KDIR)
autotools.make("-C vboxsf KERN_DIR=/lib/modules/%s/build" % KDIR)
#autotools.make("-C vboxsf KERN_DIR=/lib/modules/%s/build" % KDIR)
autotools.make("-C vboxvideo KERN_DIR=/lib/modules/%s/build" % KDIR)
def install():
kernel/drivers/module-virtualbox-guest/pspec.xml
+4 -4
View File
@@ -12,12 +12,12 @@
<IsA>driver</IsA>
<Summary>Kernel modules for VirtualBox guest machines</Summary>
<Description>This package provides the kernel modules needed for mouse integration and shared folder support between VirtualBox host and guest systems.</Description>
<Archive sha1sum="c9a96e8e3946bc5996d83667c910e017d6a4a6cd" type="tarxz">https://sourceforge.net/projects/pisilinux/files/source/module-virtualbox-guest-5.2.20.tar.xz</Archive>
<Archive sha1sum="c745ceae116db2aaa35b4b799359badaf133af81" type="tarxz">https://sourceforge.net/projects/pisilinux/files/source/module-virtualbox-guest-5.2.22.tar.xz</Archive>
<BuildDependencies>
<Dependency version="4.14.73">kernel-module-headers</Dependency>
</BuildDependencies>
<Patches>
<!-- <Patch>vboxsf-make.patch</Patch> -->
<Patch>vboxsf-make.patch</Patch>
</Patches>
</Source>
@@ -56,8 +56,8 @@
<History>
<Update release="34">
<Date>2018-11-06</Date>
<Version>5.2.20</Version>
<Date>2018-11-23</Date>
<Version>5.2.22</Version>
<Comment>Rebuild</Comment>
<Name>Ertuğrul Erata</Name>
<Email>ertugrulerata@gmail.com</Email>
kernel/drivers/module-virtualbox/pspec.xml
+3 -3
View File
@@ -12,7 +12,7 @@
<IsA>driver</IsA>
<Summary>Kernel modules for VirtualBox</Summary>
<Description>This package provides the kernel support for VirtualBox.</Description>
<Archive sha1sum="7a2fdde3d8b7ef72fea632c872cdbd7050287e87" type="tarxz">https://sourceforge.net/projects/pisilinux/files/source/module-virtualbox-5.2.20.tar.xz</Archive>
<Archive sha1sum="82843af44ef6db5ee6c93b273d41fde346465b44" type="tarxz">https://sourceforge.net/projects/pisilinux/files/source/module-virtualbox-5.2.22.tar.xz</Archive>
<BuildDependencies>
<Dependency version="4.14.73">kernel-module-headers</Dependency>
</BuildDependencies>
@@ -51,8 +51,8 @@
<History>
<Update release="34">
<Date>2018-11-06</Date>
<Version>5.2.20</Version>
<Date>2018-11-23</Date>
<Version>5.2.22</Version>
<Comment>Rebuild</Comment>
<Name>Ertuğrul Erata</Name>
<Email>ertugrulerata@gmail.com</Email>
pisi-index.xml
+13800 -13566
View File
File diff suppressed because it is too large Load Diff
pisi-index.xml.sha1sum
+1 -1
View File
@@ -1 +1 @@
f49c50b0da96caec7b68e7fc7583f2fa0f6c61c6
c953c7704009fe0cbd4b6bb200830da17f74d4af
pisi-index.xml.xz
BIN
View File
Binary file not shown.
pisi-index.xml.xz.sha1sum
+1 -1
View File
@@ -1 +1 @@
e184aea059ba7f1323ff7924e00ed9d5b5ccf22c
1a0345847994408398cc3ada55e10ac53a4a0ee7
system/base/acl/actions.py
+7 -3
View File
@@ -14,17 +14,21 @@ def setup():
shelltools.export("DEBUG", "-DNDEBUG")
autotools.rawConfigure("--libdir=/lib \
--disable-static \
--mandir=/usr/share/man \
--libexecdir=/lib \
--bindir=/bin")
pisitools.dosed("libtool", " -shared ", " -Wl,-O1,--as-needed -shared ")
def build():
autotools.make()
def install():
autotools.make("DESTDIR=%s install install-lib install-dev" % get.installDIR())
pisitools.remove("/lib/*.a")
autotools.rawInstall("DESTDIR=%s" % get.installDIR())
shelltools.chmod("%s/lib/libacl.so.*.*.*" % get.installDIR(), 0755)
shelltools.copytree("%s/lib/pkgconfig" % get.installDIR(), "%s/usr/lib/pkgconfig" % get.installDIR())
pisitools.removeDir("/lib/pkgconfig")
pisitools.dodoc("README")
system/base/acl/pspec.xml
+9 -1
View File
@@ -14,7 +14,7 @@
<IsA>library</IsA>
<Summary>Access control list utilities</Summary>
<Description>acl contains the getfacl and setfacl utilities needed for manipulating access control lists along with the needed libraries.</Description>
<Archive sha1sum="537dddc0ee7b6aa67960a3de2d36f1e2ff2059d9" type="targz">http://download.savannah.gnu.org/releases/acl/acl-2.2.52.src.tar.gz</Archive>
<Archive sha1sum="6c9e46602adece1c2dae91ed065899d7f810bf01" type="targz">http://download.savannah.gnu.org/releases/acl/acl-2.2.53.tar.gz</Archive>
<BuildDependencies>
<Dependency>attr-devel</Dependency>
</BuildDependencies>
@@ -41,11 +41,19 @@
</RuntimeDependencies>
<Files>
<Path fileType="header">/usr/include</Path>
<Path fileType="library">/usr/lib/pkgconfig</Path>
<Path fileType="man">/usr/share/man/man3</Path>
</Files>
</Package>
<History>
<Update release="5">
<Date>2018-11-28</Date>
<Version>2.2.53</Version>
<Comment>Version bump.</Comment>
<Name>Ertuğrul Erata</Name>
<Email>ertugrulerata@gmail.com</Email>
</Update>
<Update release="4">
<Date>2018-07-15</Date>
<Version>2.2.52</Version>
system/base/attr/actions.py
+10 -2
View File
@@ -7,12 +7,15 @@
from pisi.actionsapi import get
from pisi.actionsapi import autotools
from pisi.actionsapi import pisitools
from pisi.actionsapi import shelltools
suffix = "32" if get.buildTYPE() == "emul32" else ""
bindir = "/tmp" if get.buildTYPE() == "emul32" else "/bin"
def setup():
autotools.rawConfigure("--libdir=/lib%s \
--sysconfdir=/etc \
--disable-static \
--mandir=/usr/share/man \
--libexecdir=/lib%s \
--bindir=%s" % (suffix, suffix, bindir))
@@ -20,7 +23,12 @@ def build():
autotools.make()
def install():
autotools.make("DIST_ROOT=%s install install-lib install-dev" % get.installDIR())
autotools.rawInstall("DESTDIR=%s" % get.installDIR())
if get.buildTYPE() == "emul32":
shelltools.copytree("%s/lib32/pkgconfig" % get.installDIR(), "%s/usr/lib32/pkgconfig" % get.installDIR())
pisitools.removeDir("/tmp")
pisitools.remove("/lib%s/libattr.a" % suffix)
pisitools.removeDir("/lib32/pkgconfig")
return
shelltools.copytree("%s/lib/pkgconfig" % get.installDIR(), "%s/usr/lib/pkgconfig" % get.installDIR())
pisitools.removeDir("/lib/pkgconfig")
system/base/attr/pspec.xml
+11 -1
View File
@@ -13,13 +13,14 @@
<IsA>library</IsA>
<Summary>Utilities for managing filesystems extended attributes</Summary>
<Description>attr contains a set of tools for manipulating extended attributes on filesystem objects, in particular getfattr and setfattr.</Description>
<Archive sha1sum="5060f0062baee6439f41a433325b8b3671f8d2d8" type="targz">http://download.savannah.gnu.org/releases/attr/attr-2.4.47.src.tar.gz</Archive>
<Archive sha1sum="d7c88cb5db51c5e255a511b0a15e832fcdda5b4f" type="targz">http://download.savannah.nongnu.org/releases/attr/attr-2.4.48.tar.gz</Archive>
</Source>
<Package>
<Name>attr</Name>
<Files>
<Path fileType="executable">/bin</Path>
<Path fileType="conf">/etc</Path>
<Path fileType="library">/lib</Path>
<Path fileType="localedata">/usr/share/locale</Path>
<Path fileType="doc">/usr/share/doc</Path>
@@ -36,6 +37,8 @@
</RuntimeDependencies>
<Files>
<Path fileType="header">/usr/include</Path>
<Path fileType="library">/usr/lib/pkgconfig</Path>
<Path fileType="library">/usr/lib32/pkgconfig</Path>
<Path fileType="man">/usr/share/man/man3</Path>
</Files>
</Package>
@@ -56,6 +59,13 @@
</Package>
<History>
<Update release="5">
<Date>2018-11-28</Date>
<Version>2.4.48</Version>
<Comment>Version bump.</Comment>
<Name>Ertuğrul Erata</Name>
<Email>ertugrulerata@gmail.com</Email>
</Update>
<Update release="4">
<Date>2018-07-15</Date>
<Version>2.4.47</Version>
system/base/baselayout/comar/package.py
+3 -4
View File
@@ -119,7 +119,8 @@ def postInstall(fromVersion, fromRelease, toVersion, toRelease):
(22, "sshd"),
(30, "squid"),
(32, "rpc"),
#(46, "plugdev"),
# libftdi need plugdev
(46, "plugdev"),
(50, "named"),
# For systemd/var-lock.mount
(54, "lock"),
@@ -128,7 +129,7 @@ def postInstall(fromVersion, fromRelease, toVersion, toRelease):
(80, "apache"),
(90, "dovecot"),
(100, "users"),
(102, "hal"),
(102, "input"),
(103, "polkitd"),
(104, "postfix"),
(105, "postdrop"),
@@ -221,7 +222,6 @@ def postInstall(fromVersion, fromRelease, toVersion, toRelease):
(70, "postgres", "PostgreSQL", "/var/lib/postgresql", "/bin/false", "", ["postgres"], [], []),
(80, "apache", "Apache", "/dev/null", "/bin/false", "", ["apache", "svn"], [], []),
(90, "dovecot", "Dovecot", "/dev/null", "/bin/false", "", ["dovecot"], [], []),
(102, "hal", "HAL", "/dev/null", "/bin/false", "", ["hal"], [], []),
(103, "polkitd", "PolicyKit", "/var/lib/polkit-1", "/bin/false", "", ["polkitd"], [], []),
(104, "postfix", "Postfix", "/var/spool/postfix", "/bin/false", "", ["postfix"], [], []),
(106, "smmsp", "smmsp", "/var/spool/mqueue", "/bin/false", "", ["smmsp"], [], []),
@@ -259,7 +259,6 @@ def postInstall(fromVersion, fromRelease, toVersion, toRelease):
(162, "privoxy", "Privoxy", "/etc/privoxy", "/sbin/nologin", "", ["privoxy"], [], []),
(163, "qemu", "qemu user", "/", "/sbin/nologin", "", ["qemu", "kvm"], [], []),
(164, "polipo", "polipo user", "/", "/sbin/nologin", "", ["polipo"], [], []),
(165, "kdm", "kdm", "/var", "/sbin/nologin", "", ["kdm"], [], []),
(166, "nginx", "nginx user", "/etc/nginx", "/sbin/nologin", "", ["nginx"], [], []),
(167, "ntop", "ntop user", "/var/lib/ntop", "/sbin/nologin", "", ["ntop"], [], []),
(168, "smolt", "smolt user", "/dev/null", "/bin/false", "", [], [], []),
system/base/baselayout/files/os-release
+8
View File
@@ -0,0 +1,8 @@
NAME=PisiLinux
ID=pisilinux
VERSION="2"
VERSION_CODENAME=Ata
VERSION_ID="2.0"
PRETTY_NAME="PisiLinux 2.0 Ata"
HOME_URL="https://www.pisilinux.org/"
BUG_REPORT_URL="https://github.com/pisilinux/main/issues"
system/base/baselayout/files/pisilinux-release
+1 -1
View File
@@ -1 +1 @@
Pisi_Linux 2.0
Pisi_Linux 2.1
system/base/baselayout/pspec.xml
+16
View File
@@ -54,6 +54,8 @@
<!-- Release file for Pisi Linux, there's another in lsb-release package -->
<AdditionalFile owner="root" permission="0644" target="/etc/pisilinux-release">pisilinux-release</AdditionalFile>
<!-- os-release file for same package need this (fwupd) -->
<AdditionalFile owner="root" permission="0644" target="/etc/os-release">os-release</AdditionalFile>
<!-- Should be dropped after switching to systemd as the only user is COMAR -->
<AdditionalFile owner="root" permission="0644" target="/usr/share/man/man8/start-stop-daemon.8">start-stop-daemon.8</AdditionalFile>
@@ -67,6 +69,20 @@
</Package>
<History>
<Update release="7">
<Date>2018-12-08</Date>
<Version>3.10.1</Version>
<Comment>add new group; input - plugdev.</Comment>
<Name>Ertuğrul Erata</Name>
<Email>ertugrulerata@gmail.com</Email>
</Update>
<Update release="6">
<Date>2018-11-14</Date>
<Version>3.10.1</Version>
<Comment>Rebuild</Comment>
<Name>Ertuğrul Erata</Name>
<Email>ertugrulerata@gmail.com</Email>
</Update>
<Update release="5">
<Date>2018-07-15</Date>
<Version>3.10.1</Version>
system/base/bash/files/fedora/bash-4.4-assignment-error.patch
+31
View File
@@ -0,0 +1,31 @@
diff --git a/execute_cmd.h b/execute_cmd.h
--- a/execute_cmd.h
+++ b/execute_cmd.h
@@ -37,6 +37,9 @@ struct func_array_state
};
#endif
+/* Variables delared in execute_cmd.c, used by many other files */
+extern int executing_command_builtin;
+
extern struct fd_bitmap *new_fd_bitmap __P((int));
extern void dispose_fd_bitmap __P((struct fd_bitmap *));
extern void close_fd_bitmap __P((struct fd_bitmap *));
diff --git a/subst.c b/subst.c
--- a/subst.c
+++ b/subst.c
@@ -10676,11 +10676,12 @@ expand_word_list_internal (list, eflags)
tint = do_word_assignment (temp_list->word, 0);
this_command_name = savecmd;
/* Variable assignment errors in non-interactive shells
- running in Posix.2 mode cause the shell to exit. */
+ running in Posix.2 mode cause the shell to exit, unless
+ they are being run by the `command' builtin. */
if (tint == 0)
{
last_command_exit_value = EXECUTION_FAILURE;
- if (interactive_shell == 0 && posixly_correct)
+ if (interactive_shell == 0 && posixly_correct && executing_command_builtin == 0)
exp_jump_to_top_level (FORCE_EOF);
else
exp_jump_to_top_level (DISCARD);
system/base/bash/files/fedora/bash-4.4-case-in-command-subst.patch
+18
View File
@@ -0,0 +1,18 @@
diff --git a/parse.y b/parse.y
--- a/parse.y
+++ b/parse.y
@@ -4011,11 +4011,13 @@ eof_error:
tflags |= LEX_RESWDOK;
lex_rwlen = 0;
}
- else
+ else if (shellmeta (ch) == 0)
{
tflags &= ~LEX_RESWDOK;
/*itrace("parse_comsub:%d: found `%.4s', lex_reswdok -> 0", line_number, ret+retind-4);*/
}
+ else /* can't be in a reserved word any more */
+ lex_rwlen = 0;
}
else if MBTEST((tflags & LEX_CKCOMMENT) && ch == '#' && (lex_rwlen == 0 || ((tflags & LEX_INWORD) && lex_wlen == 0)))
; /* don't modify LEX_RESWDOK if we're starting a comment */
system/base/bash/files/fedora/bash-4.4-coverity.patch
+203
View File
@@ -0,0 +1,203 @@
diff --git a/builtins/fc.def b/builtins/fc.def
index fe16471..98c53db 100644
--- a/builtins/fc.def
+++ b/builtins/fc.def
@@ -423,6 +423,7 @@ fc_builtin (list)
{
sh_wrerror ();
fclose (stream);
+ FREE (fn);
return (EXECUTION_FAILURE);
}
fclose (stream);
diff --git a/execute_cmd.c b/execute_cmd.c
index 63a332a..15b5e19 100644
--- a/execute_cmd.c
+++ b/execute_cmd.c
@@ -2196,8 +2196,10 @@ coproc_setvars (cp)
if (v == 0)
{
v = find_variable_nameref_for_create (cp->c_name, 1);
- if (v == INVALID_NAMEREF_VALUE)
- return;
+ if (v == INVALID_NAMEREF_VALUE) {
+ free (namevar);
+ return;
+ }
if (v && nameref_p (v))
{
free (cp->c_name);
@@ -2210,6 +2212,7 @@ coproc_setvars (cp)
{
if (readonly_p (v))
err_readonly (cp->c_name);
+ free (namevar);
return;
}
if (v == 0)
@@ -5528,7 +5531,6 @@ shell_execve (command, args, env)
char *interp;
int ilen;
- close (fd);
interp = getinterp (sample, sample_len, (int *)NULL);
ilen = strlen (interp);
errno = i;
diff --git a/expr.c b/expr.c
index 172964a..5dc57c0 100644
--- a/expr.c
+++ b/expr.c
@@ -207,7 +207,8 @@ static intmax_t exp5 __P((void));
static intmax_t exp4 __P((void));
static intmax_t expshift __P((void));
static intmax_t exp3 __P((void));
-static intmax_t exp2 __P((void));
+/* Avoid name clash with standard exp2 */
+static intmax_t bash_exp2 __P((void));
static intmax_t exppower __P((void));
static intmax_t exp1 __P((void));
static intmax_t exp0 __P((void));
@@ -809,14 +810,14 @@ exp3 ()
{
register intmax_t val1, val2;
- val1 = exp2 ();
+ val1 = bash_exp2 ();
while ((curtok == PLUS) || (curtok == MINUS))
{
int op = curtok;
readtok ();
- val2 = exp2 ();
+ val2 = bash_exp2 ();
if (op == PLUS)
val1 += val2;
@@ -828,7 +829,7 @@ exp3 ()
}
static intmax_t
-exp2 ()
+bash_exp2 ()
{
register intmax_t val1, val2;
#if defined (HAVE_IMAXDIV)
diff --git a/lib/glob/glob.c b/lib/glob/glob.c
index 7f6eafe..c018e29 100644
--- a/lib/glob/glob.c
+++ b/lib/glob/glob.c
@@ -576,7 +576,7 @@ glob_vector (pat, dir, flags)
register char *nextname, *npat, *subdir;
unsigned int count;
int lose, skip, ndirs, isdir, sdlen, add_current, patlen;
- register char **name_vector;
+ register char **name_vector = NULL;
register unsigned int i;
int mflags; /* Flags passed to strmatch (). */
int pflags; /* flags passed to sh_makepath () */
@@ -894,7 +894,7 @@ glob_vector (pat, dir, flags)
}
/* Don't call QUIT; here; let higher layers deal with it. */
-
+ FREE (name_vector);
return ((char **)NULL);
}
diff --git a/lib/sh/pathcanon.c b/lib/sh/pathcanon.c
index f19bd55..2a565d6 100644
--- a/lib/sh/pathcanon.c
+++ b/lib/sh/pathcanon.c
@@ -227,7 +227,7 @@ sh_canonpath (path, flags)
if (result[2] == '\0') /* short-circuit for bare `//' */
result[1] = '\0';
else
- strcpy (result, result + 1);
+ memmove(result, result + 1, strlen(result + 1) + 1);
}
return (result);
diff --git a/lib/sh/pathphys.c b/lib/sh/pathphys.c
index 26016b7..b64c4cd 100644
--- a/lib/sh/pathphys.c
+++ b/lib/sh/pathphys.c
@@ -245,7 +245,7 @@ error:
if (result[2] == '\0') /* short-circuit for bare `//' */
result[1] = '\0';
else
- strcpy (result, result + 1);
+ memmove(result, result + 1, strlen(result + 1) + 1);
}
return (result);
diff --git a/shell.c b/shell.c
index b43de50..4aae182 100644
--- a/shell.c
+++ b/shell.c
@@ -1948,8 +1948,10 @@ show_shell_usage (fp, extra)
fputs (_("\t-ilrsD or -c command or -O shopt_option\t\t(invocation only)\n"), fp);
for (i = 0, set_opts = 0; shell_builtins[i].name; i++)
- if (STREQ (shell_builtins[i].name, "set"))
+ if (STREQ (shell_builtins[i].name, "set")) {
set_opts = savestring (shell_builtins[i].short_doc);
+ break;
+ }
if (set_opts)
{
s = strchr (set_opts, '[');
diff --git a/subst.c b/subst.c
index 5f3e41e..7574617 100644
--- a/subst.c
+++ b/subst.c
@@ -5182,8 +5182,11 @@ parameter_list_transform (xc, itype, quoted)
list = list_rest_of_args ();
if (list == 0)
return ((char *)NULL);
- if (xc == 'A')
- return (pos_params_assignment (list, itype, quoted));
+ if (xc == 'A') {
+ ret = pos_params_assignment (list, itype, quoted);
+ dispose_words (list);
+ return (ret);
+ }
ret = list_transform (xc, (SHELL_VAR *)0, list, itype, quoted);
dispose_words (list);
return (ret);
@@ -6813,6 +6816,7 @@ parameter_brace_expand_rhs (name, value, c, quoted, pflags, qdollaratp, hasdolla
{
report_error (_("%s: invalid indirect expansion"), name);
free (vname);
+ free (t1);
dispose_word (w);
return &expand_wdesc_error;
}
@@ -6820,6 +6824,7 @@ parameter_brace_expand_rhs (name, value, c, quoted, pflags, qdollaratp, hasdolla
{
report_error (_("%s: invalid variable name"), vname);
free (vname);
+ free (t1);
dispose_word (w);
return &expand_wdesc_error;
}
diff --git a/support/man2html.c b/support/man2html.c
index 6ba5061..1d9e376 100644
--- a/support/man2html.c
+++ b/support/man2html.c
@@ -522,6 +522,7 @@ read_man_page(char *filename)
man_buf[buf_size] = '\n';
man_buf[buf_size + 1] = man_buf[buf_size + 2] = '\0';
} else {
+ free (man_buf);
man_buf = NULL;
}
fclose(man_stream);
@@ -2562,7 +2563,6 @@ scan_request(char *c)
h = name;
if (stat(h, &stbuf) != -1)
l = stbuf.st_size;
- buf = stralloc(l + 4);
#if NOCGI
if (!out_length) {
char *t, *s;
system/base/bash/files/fedora/bash-4.4-unset-nonblock-stdin.patch
+11
View File
@@ -0,0 +1,11 @@
diff --git a/parse.y b/parse.y
index 85f1c4f..9d1cdf8 100644
--- a/parse.y
+++ b/parse.y
@@ -1453,6 +1453,7 @@ yy_readline_get ()
old_sigint = (SigHandler *)set_signal_handler (SIGINT, sigint_sighandler);
}
+ sh_unset_nodelay_mode (fileno (rl_instream)); /* just in case */
current_readline_line = readline (current_readline_prompt ?
current_readline_prompt : "");
system/base/bash/files/fedora/bash-4.5-test-modification-time.patch
+11
View File
@@ -0,0 +1,11 @@
diff --git a/config.h.in b/config.h.in
--- a/config.h.in
+++ b/config.h.in
@@ -449,6 +449,7 @@
#undef SYS_TIME_H_DEFINES_STRUCT_TIMESPEC
#undef PTHREAD_H_DEFINES_STRUCT_TIMESPEC
+#undef HAVE_STRUCT_STAT_ST_ATIM_TV_NSEC
#undef TYPEOF_STRUCT_STAT_ST_ATIM_IS_STRUCT_TIMESPEC
#undef HAVE_STRUCT_STAT_ST_ATIMESPEC_TV_NSEC
#undef HAVE_STRUCT_STAT_ST_ATIMENSEC
system/base/bash/files/official/bash-4.4-patch-12.patch
+119
View File
@@ -0,0 +1,119 @@
From bc007799f0e1362100375bb95d952d28de4c62fb Mon Sep 17 00:00:00 2001
From: Chet Ramey <chet.ramey@case.edu>
Date: Fri, 27 Jan 2017 11:25:44 -0500
Subject: [PATCH] Bash-4.4 patch 12
---
patchlevel.h | 2 +-
subst.c | 32 ++++++++++++++++++++------------
2 files changed, 21 insertions(+), 13 deletions(-)
diff --git a/patchlevel.h b/patchlevel.h
index 772676c..93dbe0d 100644
--- a/patchlevel.h
+++ b/patchlevel.h
@@ -25,6 +25,6 @@
regexp `^#define[ ]*PATCHLEVEL', since that's what support/mkversion.sh
looks for to find the patch level (for the sccs version string). */
-#define PATCHLEVEL 11
+#define PATCHLEVEL 12
#endif /* _PATCHLEVEL_H_ */
diff --git a/subst.c b/subst.c
index 027a13e..dbf0157 100644
--- a/subst.c
+++ b/subst.c
@@ -2825,11 +2825,15 @@ list_string (string, separators, quoted)
/* Parse a single word from STRING, using SEPARATORS to separate fields.
ENDPTR is set to the first character after the word. This is used by
- the `read' builtin. This is never called with SEPARATORS != $IFS;
- it should be simplified.
+ the `read' builtin.
+
+ This is never called with SEPARATORS != $IFS, and takes advantage of that.
XXX - this function is very similar to list_string; they should be
combined - XXX */
+
+#define islocalsep(c) (local_cmap[(unsigned char)(c)] != 0)
+
char *
get_word_from_string (stringp, separators, endptr)
char **stringp, *separators, **endptr;
@@ -2837,6 +2841,7 @@ get_word_from_string (stringp, separators, endptr)
register char *s;
char *current_word;
int sindex, sh_style_split, whitesep, xflags;
+ unsigned char local_cmap[UCHAR_MAX+1]; /* really only need single-byte chars here */
size_t slen;
if (!stringp || !*stringp || !**stringp)
@@ -2846,20 +2851,23 @@ get_word_from_string (stringp, separators, endptr)
separators[1] == '\t' &&
separators[2] == '\n' &&
separators[3] == '\0';
- for (xflags = 0, s = ifs_value; s && *s; s++)
+ memset (local_cmap, '\0', sizeof (local_cmap));
+ for (xflags = 0, s = separators; s && *s; s++)
{
if (*s == CTLESC) xflags |= SX_NOCTLESC;
if (*s == CTLNUL) xflags |= SX_NOESCCTLNUL;
+ local_cmap[(unsigned char)*s] = 1; /* local charmap of separators */
}
s = *stringp;
slen = 0;
/* Remove sequences of whitespace at the beginning of STRING, as
- long as those characters appear in IFS. */
- if (sh_style_split || !separators || !*separators)
+ long as those characters appear in SEPARATORS. This happens if
+ SEPARATORS == $' \t\n' or if IFS is unset. */
+ if (sh_style_split || separators == 0)
{
- for (; *s && spctabnl (*s) && isifs (*s); s++);
+ for (; *s && spctabnl (*s) && islocalsep (*s); s++);
/* If the string is nothing but whitespace, update it and return. */
if (!*s)
@@ -2878,9 +2886,9 @@ get_word_from_string (stringp, separators, endptr)
This obeys the field splitting rules in Posix.2. */
sindex = 0;
- /* Don't need string length in ADVANCE_CHAR or string_extract_verbatim
- unless multibyte chars are possible. */
- slen = (MB_CUR_MAX > 1) ? STRLEN (s) : 1;
+ /* Don't need string length in ADVANCE_CHAR unless multibyte chars are
+ possible, but need it in string_extract_verbatim for bounds checking */
+ slen = STRLEN (s);
current_word = string_extract_verbatim (s, slen, &sindex, separators, xflags);
/* Set ENDPTR to the first character after the end of the word. */
@@ -2899,19 +2907,19 @@ get_word_from_string (stringp, separators, endptr)
/* Now skip sequences of space, tab, or newline characters if they are
in the list of separators. */
- while (s[sindex] && spctabnl (s[sindex]) && isifs (s[sindex]))
+ while (s[sindex] && spctabnl (s[sindex]) && islocalsep (s[sindex]))
sindex++;
/* If the first separator was IFS whitespace and the current character is
a non-whitespace IFS character, it should be part of the current field
delimiter, not a separate delimiter that would result in an empty field.
Look at POSIX.2, 3.6.5, (3)(b). */
- if (s[sindex] && whitesep && isifs (s[sindex]) && !spctabnl (s[sindex]))
+ if (s[sindex] && whitesep && islocalsep (s[sindex]) && !spctabnl (s[sindex]))
{
sindex++;
/* An IFS character that is not IFS white space, along with any adjacent
IFS white space, shall delimit a field. */
- while (s[sindex] && spctabnl (s[sindex]) && isifs (s[sindex]))
+ while (s[sindex] && spctabnl (s[sindex]) && islocalsep(s[sindex]))
sindex++;
}
--
2.9.3
system/base/bash/files/official/bash-4.4-patch-13.patch
+38
View File
@@ -0,0 +1,38 @@
From 1aef9c7b55dcef4af239caf93e01419e1c8e04ad Mon Sep 17 00:00:00 2001
From: Chet Ramey <chet.ramey@case.edu>
Date: Mon, 29 Jan 2018 16:03:33 -0500
Subject: [PATCH] Bash-4.4 patch 13
---
patchlevel.h | 2 +-
redir.c | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/patchlevel.h b/patchlevel.h
index 93dbe0db..779671cd 100644
--- a/patchlevel.h
+++ b/patchlevel.h
@@ -25,6 +25,6 @@
regexp `^#define[ ]*PATCHLEVEL', since that's what support/mkversion.sh
looks for to find the patch level (for the sccs version string). */
-#define PATCHLEVEL 12
+#define PATCHLEVEL 13
#endif /* _PATCHLEVEL_H_ */
diff --git a/redir.c b/redir.c
index 25488eaf..1858b0b0 100644
--- a/redir.c
+++ b/redir.c
@@ -469,6 +469,8 @@ here_document_to_fd (redirectee, ri)
return (fd);
}
+ SET_CLOSE_ON_EXEC (fd);
+
errno = r = 0; /* XXX */
/* write_here_document returns 0 on success, errno on failure. */
if (redirectee->word)
--
2.13.6
system/base/bash/files/official/bash-4.4-patch-14.patch
+85
View File
@@ -0,0 +1,85 @@
From 2fb21d75bfddd724b0e45d4a51455a166467e496 Mon Sep 17 00:00:00 2001
From: Chet Ramey <chet.ramey@case.edu>
Date: Mon, 29 Jan 2018 16:03:47 -0500
Subject: [PATCH] Bash-4.4 patch 14
---
execute_cmd.c | 19 ++++++++++++++++---
patchlevel.h | 2 +-
2 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/execute_cmd.c b/execute_cmd.c
index 2a3df6d6..76a80766 100644
--- a/execute_cmd.c
+++ b/execute_cmd.c
@@ -726,6 +726,8 @@ execute_command_internal (command, asynchronous, pipe_in, pipe_out,
{
ofifo = num_fifos ();
ofifo_list = copy_fifo_list ((int *)&osize);
+ begin_unwind_frame ("internal_fifos");
+ add_unwind_protect (xfree, ofifo_list);
saved_fifo = 1;
}
else
@@ -741,7 +743,10 @@ execute_command_internal (command, asynchronous, pipe_in, pipe_out,
dispose_exec_redirects ();
#if defined (PROCESS_SUBSTITUTION)
if (saved_fifo)
- free ((void *)ofifo_list);
+ {
+ free ((void *)ofifo_list);
+ discard_unwind_frame ("internal_fifos");
+ }
#endif
return (last_command_exit_value = EXECUTION_FAILURE);
}
@@ -1060,6 +1065,7 @@ execute_command_internal (command, asynchronous, pipe_in, pipe_out,
if (nfifo > ofifo)
close_new_fifos ((char *)ofifo_list, osize);
free ((void *)ofifo_list);
+ discard_unwind_frame ("internal_fifos");
}
#endif
@@ -4977,9 +4983,14 @@ execute_builtin_or_function (words, builtin, var, redirects,
char *ofifo_list;
#endif
-#if defined (PROCESS_SUBSTITUTION)
+#if defined (PROCESS_SUBSTITUTION)
+ begin_unwind_frame ("saved_fifos");
+ /* If we return, we longjmp and don't get a chance to restore the old
+ fifo list, so we add an unwind protect to free it */
ofifo = num_fifos ();
ofifo_list = copy_fifo_list (&osize);
+ if (ofifo_list)
+ add_unwind_protect (xfree, ofifo_list);
#endif
if (do_redirections (redirects, RX_ACTIVE|RX_UNDOABLE) != 0)
@@ -5063,7 +5074,9 @@ execute_builtin_or_function (words, builtin, var, redirects,
nfifo = num_fifos ();
if (nfifo > ofifo)
close_new_fifos (ofifo_list, osize);
- free (ofifo_list);
+ if (ofifo_list)
+ free (ofifo_list);
+ discard_unwind_frame ("saved_fifos");
#endif
return (result);
diff --git a/patchlevel.h b/patchlevel.h
index 779671cd..09a3cc84 100644
--- a/patchlevel.h
+++ b/patchlevel.h
@@ -25,6 +25,6 @@
regexp `^#define[ ]*PATCHLEVEL', since that's what support/mkversion.sh
looks for to find the patch level (for the sccs version string). */
-#define PATCHLEVEL 13
+#define PATCHLEVEL 14
#endif /* _PATCHLEVEL_H_ */
--
2.13.6
system/base/bash/files/official/bash-4.4-patch-15.patch
+38
View File
@@ -0,0 +1,38 @@
From 9cce630e80008e74fa9a1d9408367341caf363f2 Mon Sep 17 00:00:00 2001
From: Chet Ramey <chet.ramey@case.edu>
Date: Mon, 29 Jan 2018 16:04:01 -0500
Subject: [PATCH] Bash-4.4 patch 15
---
patchlevel.h | 2 +-
subst.c | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/patchlevel.h b/patchlevel.h
index 09a3cc84..6e9ed3fc 100644
--- a/patchlevel.h
+++ b/patchlevel.h
@@ -25,6 +25,6 @@
regexp `^#define[ ]*PATCHLEVEL', since that's what support/mkversion.sh
looks for to find the patch level (for the sccs version string). */
-#define PATCHLEVEL 14
+#define PATCHLEVEL 15
#endif /* _PATCHLEVEL_H_ */
diff --git a/subst.c b/subst.c
index dbf0157e..fc00cab0 100644
--- a/subst.c
+++ b/subst.c
@@ -5906,6 +5906,8 @@ process_substitute (string, open_for_read_in_child)
parent. */
expanding_redir = 0;
+ remove_quoted_escapes (string);
+
subshell_level++;
result = parse_and_execute (string, "process substitution", (SEVAL_NONINT|SEVAL_NOHIST));
subshell_level--;
--
2.13.6
system/base/bash/files/official/bash-4.4-patch-16.patch
+68
View File
@@ -0,0 +1,68 @@
From c9f1b04651dae16e33f0aa8974c5122e26b362ae Mon Sep 17 00:00:00 2001
From: Chet Ramey <chet.ramey@case.edu>
Date: Mon, 29 Jan 2018 16:04:20 -0500
Subject: [PATCH] Bash-4.4 patch 16
---
lib/sh/zread.c | 23 +++++++++--------------
patchlevel.h | 2 +-
2 files changed, 10 insertions(+), 15 deletions(-)
diff --git a/lib/sh/zread.c b/lib/sh/zread.c
index 868f9705..496f20b8 100644
--- a/lib/sh/zread.c
+++ b/lib/sh/zread.c
@@ -37,7 +37,10 @@ extern int errno;
# define SEEK_CUR 1
#endif
+extern int executing_builtin;
+
extern void check_signals_and_traps (void);
+extern void check_signals (void);
extern int signal_is_trapped (int);
/* Read LEN bytes from FD into BUF. Retry the read on EINTR. Any other
@@ -50,21 +53,13 @@ zread (fd, buf, len)
{
ssize_t r;
-#if 0
-#if defined (HAVE_SIGINTERRUPT)
- if (signal_is_trapped (SIGCHLD))
- siginterrupt (SIGCHLD, 1);
-#endif
-#endif
-
while ((r = read (fd, buf, len)) < 0 && errno == EINTR)
- check_signals_and_traps (); /* XXX - should it be check_signals()? */
-
-#if 0
-#if defined (HAVE_SIGINTERRUPT)
- siginterrupt (SIGCHLD, 0);
-#endif
-#endif
+ /* XXX - bash-5.0 */
+ /* We check executing_builtin and run traps here for backwards compatibility */
+ if (executing_builtin)
+ check_signals_and_traps (); /* XXX - should it be check_signals()? */
+ else
+ check_signals ();
return r;
}
diff --git a/patchlevel.h b/patchlevel.h
index 6e9ed3fc..9074f4dd 100644
--- a/patchlevel.h
+++ b/patchlevel.h
@@ -25,6 +25,6 @@
regexp `^#define[ ]*PATCHLEVEL', since that's what support/mkversion.sh
looks for to find the patch level (for the sccs version string). */
-#define PATCHLEVEL 15
+#define PATCHLEVEL 16
#endif /* _PATCHLEVEL_H_ */
--
2.13.6
system/base/bash/files/official/bash-4.4-patch-17.patch
+41
View File
@@ -0,0 +1,41 @@
From b3a5ec8dd510a68dc850f3f516c0cf9afd87451f Mon Sep 17 00:00:00 2001
From: Chet Ramey <chet.ramey@case.edu>
Date: Mon, 29 Jan 2018 16:04:37 -0500
Subject: [PATCH] Bash-4.4 patch 17
---
builtins/read.def | 5 +++++
patchlevel.h | 2 +-
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/builtins/read.def b/builtins/read.def
index 33821f3f..803bea35 100644
--- a/builtins/read.def
+++ b/builtins/read.def
@@ -690,6 +690,11 @@ add_char:
input_string[i] = '\0';
CHECK_ALRM;
+#if defined (READLINE)
+ if (edit)
+ free (rlbuf);
+#endif
+
if (retval < 0)
{
t_errno = errno;
diff --git a/patchlevel.h b/patchlevel.h
index 9074f4dd..98e714da 100644
--- a/patchlevel.h
+++ b/patchlevel.h
@@ -25,6 +25,6 @@
regexp `^#define[ ]*PATCHLEVEL', since that's what support/mkversion.sh
looks for to find the patch level (for the sccs version string). */
-#define PATCHLEVEL 16
+#define PATCHLEVEL 17
#endif /* _PATCHLEVEL_H_ */
--
2.13.6
system/base/bash/files/official/bash-4.4-patch-18.patch
+38
View File
@@ -0,0 +1,38 @@
From eb78197af36bb0fb95493ebf8fce104be6832ec9 Mon Sep 17 00:00:00 2001
From: Chet Ramey <chet.ramey@case.edu>
Date: Mon, 29 Jan 2018 16:04:56 -0500
Subject: [PATCH] Bash-4.4 patch 18
---
builtins/read.def | 2 +-
patchlevel.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/builtins/read.def b/builtins/read.def
index 803bea35..b54b3af6 100644
--- a/builtins/read.def
+++ b/builtins/read.def
@@ -610,7 +610,7 @@ read_builtin (list)
}
CHECK_ALRM;
-
+ QUIT; /* in case we didn't call check_signals() */
#if defined (READLINE)
}
#endif
diff --git a/patchlevel.h b/patchlevel.h
index 98e714da..f0ee56e4 100644
--- a/patchlevel.h
+++ b/patchlevel.h
@@ -25,6 +25,6 @@
regexp `^#define[ ]*PATCHLEVEL', since that's what support/mkversion.sh
looks for to find the patch level (for the sccs version string). */
-#define PATCHLEVEL 17
+#define PATCHLEVEL 18
#endif /* _PATCHLEVEL_H_ */
--
2.13.6
system/base/bash/files/official/bash-4.4-patch-19.patch
+40
View File
@@ -0,0 +1,40 @@
From b0776d8c49ab4310fa056ce1033985996c5b9807 Mon Sep 17 00:00:00 2001
From: Chet Ramey <chet.ramey@case.edu>
Date: Tue, 6 Feb 2018 16:22:34 -0500
Subject: [PATCH] Bash-4.4 patch 19
---
lib/readline/display.c | 4 +++-
patchlevel.h | 2 +-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/lib/readline/display.c b/lib/readline/display.c
index 41fb0531..2d2e768a 100644
--- a/lib/readline/display.c
+++ b/lib/readline/display.c
@@ -771,7 +771,9 @@ rl_redisplay ()
appear in the first and last lines of the prompt */
wadjust = (newlines == 0)
? prompt_invis_chars_first_line
- : ((newlines == prompt_lines_estimate) ? wrap_offset : prompt_invis_chars_first_line);
+ : ((newlines == prompt_lines_estimate)
+ ? (wrap_offset - prompt_invis_chars_first_line)
+ : 0);
/* fix from Darin Johnson <darin@acuson.com> for prompt string with
invisible characters that is longer than the screen width. The
diff --git a/patchlevel.h b/patchlevel.h
index f0ee56e4..a711c495 100644
--- a/patchlevel.h
+++ b/patchlevel.h
@@ -25,6 +25,6 @@
regexp `^#define[ ]*PATCHLEVEL', since that's what support/mkversion.sh
looks for to find the patch level (for the sccs version string). */
-#define PATCHLEVEL 18
+#define PATCHLEVEL 19
#endif /* _PATCHLEVEL_H_ */
--
2.13.6
system/base/bash/pspec.xml
+21 -1
View File
@@ -28,7 +28,14 @@
<Patch level="1">official/bash-4.4-patch-8.patch</Patch>
<Patch level="1">official/bash-4.4-patch-9.patch</Patch>
<Patch level="1">official/bash-4.4-patch-10.patch</Patch>
<Patch level="1">official/bash-4.4-patch-11.patch</Patch>
<Patch level="1">official/bash-4.4-patch-11.patch</Patch>
<Patch level="1">official/bash-4.4-patch-12.patch</Patch>
<Patch level="1">official/bash-4.4-patch-13.patch</Patch>
<Patch level="1">official/bash-4.4-patch-14.patch</Patch>
<Patch level="1">official/bash-4.4-patch-15.patch</Patch>
<Patch level="1">official/bash-4.4-patch-16.patch</Patch>
<Patch level="1">official/bash-4.4-patch-17.patch</Patch>
<Patch level="1">official/bash-4.4-patch-18.patch</Patch>
<!-- Fedora patches -->
<Patch level="1">fedora/bash-2.02-security.patch</Patch>
@@ -58,6 +65,12 @@
<Patch level="1">fedora/bash-4.3-noecho.patch</Patch>
<Patch level="1">fedora/bash-4.3-memleak-lc_all.patch</Patch>
<Patch level="1">fedora/bash-4.4-no-loadable-builtins.patch</Patch>
<Patch level="1">fedora/bash-4.4-unset-nonblock-stdin.patch</Patch>
<Patch level="1">fedora/bash-4.4-assignment-error.patch</Patch>
<Patch level="1">fedora/bash-4.5-test-modification-time.patch</Patch>
<Patch level="1">fedora/bash-4.4-case-in-command-subst.patch</Patch>
<Patch level="1">fedora/bash-4.4-coverity.patch</Patch>
</Patches>
</Source>
@@ -82,6 +95,13 @@
</Package>
<History>
<Update release="7">
<Date>2018-11-28</Date>
<Version>4.4.18</Version>
<Comment>Version bump.</Comment>
<Name>Ertuğrul Erata</Name>
<Email>ertugrulerata@gmail.com</Email>
</Update>
<Update release="6">
<Date>2018-07-15</Date>
<Version>4.4.11</Version>
system/base/coreutils/files/coreutils-8.30-i18n-1.patch
+5521
View File
File diff suppressed because it is too large Load Diff
system/base/coreutils/pspec.xml
+9 -2
View File
@@ -12,7 +12,7 @@
<IsA>app:console</IsA>
<Summary>A set of basic GNU tools commonly used in shell scripts</Summary>
<Description>Standard GNU file utilities (chmod, cp, dd, dir, ls...), text utilities (sort, tr, head, wc..), and shell utilities (whoami, who,...)</Description>
<Archive sha1sum="63d522f430f0f9fceca71e4b52b414999531915c" type="tarxz">http://ftp.gnu.org/gnu/coreutils/coreutils-8.29.tar.xz</Archive>
<Archive sha1sum="bd5d495c162730873a2774acd1c5091fbf0c55a4" type="tarxz">http://ftp.gnu.org/gnu/coreutils/coreutils-8.30.tar.xz</Archive>
<BuildDependencies>
<Dependency>acl-devel</Dependency>
<Dependency>attr-devel</Dependency>
@@ -25,7 +25,7 @@
<Dependency>texinfo</Dependency>
</BuildDependencies>
<Patches>
<!-- <Patch level="1">coreutils-8.22-shuf-segfault.patch</Patch> -->
<Patch level="1">coreutils-8.30-i18n-1.patch</Patch>
<!-- PisiLinux patches -->
<Patch level="0">remove_am_silent_rules.patch</Patch>
<!-- <Patch level="0">add-more-dircolors.patch</Patch> -->
@@ -55,6 +55,13 @@
</Package>
<History>
<Update release="7">
<Date>2018-11-28</Date>
<Version>8.30</Version>
<Comment>Version bump.</Comment>
<Name>Ertuğrul Erata</Name>
<Email>ertugrulerata@gmail.com</Email>
</Update>
<Update release="6">
<Date>2018-07-15</Date>
<Version>8.29</Version>
system/base/eudev/actions.py
+2 -2
View File
@@ -13,8 +13,8 @@ from pisi.actionsapi import get
suffix = "32" if get.buildTYPE() == "emul32" else ""
def setup():
shelltools.system("./autogen.sh")
autotools.autoreconf("-fis")
autotools.configure("--prefix=/usr \
--bindir=/sbin \
--sbindir=/sbin \
system/base/eudev/pspec.xml
+8
View File
@@ -24,6 +24,7 @@
<Dependency>libpcre-devel</Dependency>
<Dependency>libxslt-devel</Dependency>
<Dependency>gperf</Dependency>
<Dependency>intltool</Dependency>
</BuildDependencies>
<!--Patches>
<Patch>upstream.patch</Patch>
@@ -91,6 +92,13 @@
</Package>
<History>
<Update release="10">
<Date>2018-11-28</Date>
<Version>3.2.5</Version>
<Comment>add intltool builddep.</Comment>
<Name>Ertuğrul Erata</Name>
<Email>ertugrulerata@gmail.com</Email>
</Update>
<Update release="9">
<Date>2018-07-15</Date>
<Version>3.2.5</Version>
system/base/expat/pspec.xml
+8 -1
View File
@@ -12,7 +12,7 @@
<IsA>library</IsA>
<Summary>XML parsing libraries</Summary>
<Description>This is expat, the C library for parsing XML, written by James Clark. Expat is a stream oriented XML parser. This means that you register handlers with the parser prior to starting the parse. These handlers are called when the parser discovers the associated structures in the document being parsed. A start tag is an example of the kind of structures for which you may register handlers.</Description>
<Archive sha1sum="490659abd7d6c6d4cb4e60c945a15fbf081564f6" type="tarbz2">mirrors://sourceforge/expat/expat-2.2.5.tar.bz2</Archive>
<Archive sha1sum="c8947fc3119a797b55485f2f7bdaaeb49cc9df01" type="tarbz2">mirrors://sourceforge/expat/expat-2.2.6.tar.bz2</Archive>
<BuildDependencies>
<Dependency>gnuconfig</Dependency>
<Dependency>glibc-devel</Dependency>
@@ -63,6 +63,13 @@
</Package>
<History>
<Update release="8">
<Date>2018-11-28</Date>
<Version>2.2.6</Version>
<Comment>Version bump.</Comment>
<Name>Ertuğrul Erata</Name>
<Email>ertugrulerata@gmail.com</Email>
</Update>
<Update release="7">
<Date>2018-07-15</Date>
<Version>2.2.5</Version>
system/base/gawk/pspec.xml
+8 -1
View File
@@ -12,7 +12,7 @@
<IsA>app:console</IsA>
<Summary>GNU awk pattern-matching language</Summary>
<Description>The awk utility interprets a special-purpose programming language that makes it possible to handle simple data-reformatting jobs with just a few lines of code. It helps you to make changes in various text files wherever certain patterns appear, or extract data from parts of certain lines while discarding the rest. Gawk is the GNU implementation of awk.</Description>
<Archive sha1sum="6e725bd9591a384adb903b1cd5eee71d8949e40d" type="tarxz">http://mirrors.kernel.org/gnu/gawk/gawk-4.2.0.tar.xz</Archive>
<Archive sha1sum="71fc3595865ea6ea859587cbbb35cbf9aeb39d2d" type="tarxz">http://mirrors.kernel.org/gnu/gawk/gawk-4.2.1.tar.xz</Archive>
<BuildDependencies>
<Dependency>gettext</Dependency>
<Dependency>readline-devel</Dependency>
@@ -47,6 +47,13 @@
</Package>
<History>
<Update release="6">
<Date>2018-11-28</Date>
<Version>4.2.1</Version>
<Comment>Version bump.</Comment>
<Name>Ertuğrul Erata</Name>
<Email>ertugrulerata@gmail.com</Email>
</Update>
<Update release="5">
<Date>2018-07-15</Date>
<Version>4.2.0</Version>
system/base/lsb-release/files/lsb-release
+1 -1
View File
@@ -1,4 +1,4 @@
DISTRIB_ID="PisiLinux"
DISTRIB_RELEASE="2.0"
DISTRIB_DESCRIPTION="Pisi GNU/Linux 2.0"
DISTRIB_DESCRIPTION="Pisi GNU/Linux 2.1"
DISTRIB_CODENAME="Ataturk"
system/base/lsb-release/pspec.xml
+7
View File
@@ -31,6 +31,13 @@
</AdditionalFiles>
</Package>
<History>
<Update release="8">
<Date>2018-11-14</Date>
<Version>1.4</Version>
<Comment>Rebuild</Comment>
<Name>Ertuğrul Erata</Name>
<Email>ertugrulerata@gmail.com</Email>
</Update>
<Update release="7">
<Date>2018-07-15</Date>
<Version>1.4</Version>
system/base/man-db/actions.py
+1 -1
View File
@@ -18,7 +18,7 @@ def setup():
--enable-mb-groff" % (get.docDIR(), get.srcNAME()))
def build():
shelltools.system("sed -i '/gets is a security hole/d' gnulib/lib/stdio.in.h")
#shelltools.system("sed -i '/gets is a security hole/d' gnulib/lib/stdio.in.h")
autotools.make("CC='%s %s' V=1 nls=all" % (get.CC(), get.CFLAGS()))
def install():
system/base/man-db/pspec.xml
+8 -1
View File
@@ -14,7 +14,7 @@
<IsA>data:doc</IsA>
<Summary>Application to read Linux man pages</Summary>
<Description>Man package consists of programs which is used to read most of the documentation available in linux system. For example, you can write "man nameoftheprogram" into the konsole or "man:nameoftheprogram" into the konqueror to get a detailed usage information for many programs.</Description>
<Archive sha1sum="d29414122f5d53d32b4bdec66fe0273cb3be2bf9" type="tarxz">http://download.savannah.gnu.org/releases/man-db/man-db-2.8.1.tar.xz</Archive>
<Archive sha1sum="729096a35fec13df8b7b350fdc1b323f990b6144" type="tarxz">http://download.savannah.gnu.org/releases/man-db/man-db-2.8.4.tar.xz</Archive>
<BuildDependencies>
<Dependency>less</Dependency>
<Dependency>gzip</Dependency>
@@ -53,6 +53,13 @@
</Package>
<History>
<Update release="6">
<Date>2018-11-29</Date>
<Version>2.8.4</Version>
<Comment>Version bump.</Comment>
<Name>Ertuğrul Erata</Name>
<Email>ertugrulerata@gmail.com</Email>
</Update>
<Update release="5">
<Date>2018-07-15</Date>
<Version>2.8.1</Version>
system/base/man-pages/pspec.xml
+9 -2
View File
@@ -12,8 +12,8 @@
<IsA>data:doc</IsA>
<Summary>A somewhat comprehensive collection of Linux man pages</Summary>
<Description>A large collection of man pages (documentation) from the Linux Documentation Project (LDP).</Description>
<Archive sha1sum="05ec29cc69586f276fbeaccd3b466f3456292010" type="tarxz">https://www.kernel.org/pub/linux/docs/man-pages/man-pages-4.15.tar.xz</Archive>
<Archive sha1sum="b9c65a46e2061a1b2d4ee7bcc3e46603517b1f42" target="man-pages-4.15" type="tarxz">http://www.kernel.org/pub/linux/docs/man-pages/man-pages-posix/man-pages-posix-2003-a.tar.xz</Archive>
<Archive sha1sum="f2937d7b32c989b8b60e1a8ede7a5dff51b09ddc" type="tarxz">https://www.kernel.org/pub/linux/docs/man-pages/man-pages-4.16.tar.xz</Archive>
<Archive sha1sum="b9c65a46e2061a1b2d4ee7bcc3e46603517b1f42" target="man-pages-4.16" type="tarxz">http://www.kernel.org/pub/linux/docs/man-pages/man-pages-posix/man-pages-posix-2003-a.tar.xz</Archive>
</Source>
<Package>
@@ -32,6 +32,13 @@
</Package>
<History>
<Update release="7">
<Date>2018-11-29</Date>
<Version>4.16</Version>
<Comment>Version bump.</Comment>
<Name>Ertuğrul Erata</Name>
<Email>ertugrulerata@gmail.com</Email>
</Update>
<Update release="6">
<Date>2018-07-15</Date>
<Version>4.15</Version>
system/base/openssl/pspec.xml
+8 -1
View File
@@ -13,7 +13,7 @@
<IsA>library</IsA>
<Summary>Toolkit for SSL v2/v3 and TLS v1</Summary>
<Description>OpenSSL is a cryptography toolkit implementing the Secure Sockets Layer (SSL v2/v3) and Transport Layer Security (TLS v1) network protocols and related cryptography standards required by them.</Description>
<Archive sha1sum="a47faaca57b47a0d9d5fb085545857cc92062691" type="targz">https://www.openssl.org/source/openssl-1.0.2o.tar.gz</Archive>
<Archive sha1sum="692f5f2f1b114f8adaadaa3e7be8cce1907f38c5" type="targz">https://www.openssl.org/source/openssl-1.0.2q.tar.gz</Archive>
<AdditionalFiles>
<AdditionalFile target="openssl-1.0.0-beta4-ca-dir.patch">openssl-1.0.0-beta4-ca-dir.patch</AdditionalFile>
<!--AdditionalFile target="ca-dir.patch">ca-dir.patch</AdditionalFile-->
@@ -92,6 +92,13 @@
</Package>
<History>
<Update release="7">
<Date>2018-11-28</Date>
<Version>1.0.2q</Version>
<Comment>Version bump.</Comment>
<Name>Ertuğrul Erata</Name>
<Email>ertugrulerata@gmail.com</Email>
</Update>
<Update release="6">
<Date>2018-08-11</Date>
<Version>1.0.2o</Version>
system/base/pciutils/actions.py
+5 -2
View File
@@ -13,13 +13,16 @@ def build():
SHARED="yes" \
PREFIX=/usr \
IDSDIR="/usr/share/misc" \
MANDIR="/usr/share/man" \
all' % get.CFLAGS())
def install():
autotools.rawInstall('DESTDIR="%s" \
PREFIX=/usr \
SHARED="yes" \
IDSDIR="/usr/share/misc" \
MANDIR="/usr/share/man" \
install-lib' % get.installDIR())
# remove update-pciids
pisitools.remove("/usr/sbin/update-pciids")
pisitools.remove("/usr/share/man/man8/update-pciids.8")
system/base/pciutils/files/pci.ids
+3767 -684
View File
File diff suppressed because it is too large Load Diff
system/base/pciutils/files/pciutils-3.1.9-static-pc.patch
+13
View File
@@ -0,0 +1,13 @@
make sure all lib entries get into libs.private in the .pc file
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -61,7 +61,7 @@ $(PCILIBPC): libpci.pc.in
-e 's,@LIBDIR@,$(LIBDIR),' \
-e 's,@IDSDIR@,$(IDSDIR),' \
-e 's,@VERSION@,$(VERSION),' \
- -e 's,@LDLIBS@,$(LDLIBS),'
+ -e 's,@LDLIBS@,$(LDLIBS) $(LIB_LDLIBS),'
init.o: init.c $(INCL)
access.o: access.c $(INCL)
system/base/pciutils/pspec.xml
+11 -4
View File
@@ -12,7 +12,7 @@
<IsA>app:console</IsA>
<Summary>Various utilities dealing with the PCI bus</Summary>
<Description>The PCI Utilities are a collection of programs for inspecting and manipulating configuration of PCI devices.</Description>
<Archive sha1sum="29d9a75ce2a2d92721b6e92c7c89236b4c91041f" type="tarxz">https://ftp.osuosl.org/pub/blfs/conglomeration/pciutils/pciutils-3.5.2.tar.xz</Archive>
<Archive sha1sum="0d75516406916cbde1e19040c05751bba2ec7833" type="tarxz">https://ftp.osuosl.org/pub/blfs/conglomeration/pciutils/pciutils-3.6.2.tar.xz</Archive>
<AdditionalFiles>
<!-- 20100714
from: http://pciids.sourceforge.net/v2.2/pci.ids
@@ -26,10 +26,10 @@
<Patches>
<!-- Disable gz support of pciids file -->
<Patch level="1">pciutils-nogz.patch</Patch>
<Patch level="1">pciutils-3.1.9-static-pc.patch</Patch>
<!-- Remove update-pciids support -->
<Patch level="1">pciutils-remove-update-pciids.patch</Patch>
<Patch level="1">makefile.patch</Patch>
<!--Patch level="1">pciutils-remove-update-pciids.patch</Patch-->
</Patches>
</Source>
@@ -62,6 +62,13 @@
</Package>
<History>
<Update release="5">
<Date>2018-11-21</Date>
<Version>3.6.2</Version>
<Comment>Version bump.</Comment>
<Name>Ertuğrul Erata</Name>
<Email>ertugrulerata@gmail.com</Email>
</Update>
<Update release="4">
<Date>2018-07-15</Date>
<Version>3.5.2</Version>
system/base/procps/pspec.xml
+8 -1
View File
@@ -12,7 +12,7 @@
<IsA>app:console</IsA>
<Summary>Standard informational utilities and process-handling tools</Summary>
<Description>procps is the package that has a bunch of small useful utilities that give information about processes using the /proc filesystem. The package includes the programs ps, top, vmstat, w, kill, free, slabtop, and skill.</Description>
<Archive sha1sum="82c0745f150f1385ca01fe7d24f05f74e31c94c6" type="tarxz">http://downloads.sourceforge.net/project/procps-ng/Production/procps-ng-3.3.12.tar.xz</Archive>
<Archive sha1sum="2929bc64f0cf7b2db997eef79b7187658e47230d" type="tarxz">http://downloads.sourceforge.net/project/procps-ng/Production/procps-ng-3.3.15.tar.xz</Archive>
<BuildDependencies>
<Dependency>ncurses-devel</Dependency>
</BuildDependencies>
@@ -38,6 +38,13 @@
</Package>
<History>
<Update release="5">
<Date>2018-11-28</Date>
<Version>3.3.15</Version>
<Comment>Version bump.</Comment>
<Name>Ertuğrul Erata</Name>
<Email>ertugrulerata@gmail.com</Email>
</Update>
<Update release="4">
<Date>2018-07-15</Date>
<Version>3.3.12</Version>
system/base/sed/pspec.xml
+8 -1
View File
@@ -12,7 +12,7 @@
<IsA>app:console</IsA>
<Summary>GNU Stream Editor</Summary>
<Description>Sed is a stream editor. A stream editor is used to perform basic text transformations on an input stream (a file or input from a pipeline).</Description>
<Archive sha1sum="a196cd036efd52a8e349cfe88ab4baa555fb29d5" type="tarxz">mirrors://gnu/sed/sed-4.4.tar.xz</Archive>
<Archive sha1sum="6635c344956ef928cc33aca798ad20c6c1ea25f7" type="tarxz">mirrors://gnu/sed/sed-4.5.tar.xz</Archive>
<BuildDependencies>
<Dependency>gettext</Dependency>
<Dependency>attr-devel</Dependency>
@@ -36,6 +36,13 @@
</Package>
<History>
<Update release="6">
<Date>2018-11-28</Date>
<Version>4.5</Version>
<Comment>Version bump.</Comment>
<Name>Ertuğrul Erata</Name>
<Email>ertugrulerata@gmail.com</Email>
</Update>
<Update release="5">
<Date>2018-07-22</Date>
<Version>4.4</Version>
system/base/shadow/pspec.xml
+8 -1
View File
@@ -12,7 +12,7 @@
<IsA>app:console</IsA>
<Summary>Utilities to deal with user accounts</Summary>
<Description>The Shadow password file utilities package includes programs necessary to convert traditional V7 *NIX password files to the SVR4 shadow password format, and additional tools to maintain password and group files (that work with both shadow and non-shadow passwords).</Description>
<Archive sha1sum="35a411dd264b07b1ea7b02d45980816a810343b6" type="tarxz">https://github.com/shadow-maint/shadow/releases/download/4.5/shadow-4.5.tar.xz</Archive>
<Archive sha1sum="0b84eb1010fda5edca2a9d1733f9480200e02de6" type="tarxz">https://github.com/shadow-maint/shadow/releases/download/4.6/shadow-4.6.tar.xz</Archive>
<BuildDependencies>
<Dependency>pam-devel</Dependency>
<Dependency>gettext-devel</Dependency>
@@ -70,6 +70,13 @@
</Package>
<History>
<Update release="6">
<Date>2018-11-28</Date>
<Version>4.6</Version>
<Comment>Version bump.</Comment>
<Name>Ertuğrul Erata</Name>
<Email>ertugrulerata@gmail.com</Email>
</Update>
<Update release="5">
<Date>2018-07-15</Date>
<Version>4.5</Version>
system/base/sqlite/actions.py
+2 -2
View File
@@ -61,10 +61,10 @@ def install():
pisitools.dodoc("README*")
shelltools.cd("%s/sqlite-doc-3240000" % get.workDIR())
shelltools.cd("%s/sqlite-doc-3260000" % get.workDIR())
shelltools.system("pwd")
pisitools.insinto("/usr/share/doc/sqlite", "../sqlite-doc-3240000/*")
pisitools.insinto("/usr/share/doc/sqlite", "../sqlite-doc-3260000/*")
# fix permissions and remove obsolete files; https://bugs.archlinux.org/task/24605
shelltools.system("find %s -type f -perm 755 -exec ls -lha {} \;" % get.installDIR())
system/base/sqlite/pspec.xml
+9 -2
View File
@@ -12,8 +12,8 @@
<IsA>library</IsA>
<Summary>An SQL Database Engine in a C Library</Summary>
<Description>SQLite is a small C library that implements a self-contained, embeddable, zero-configuration SQL database engine. Supports databases up to 2 terabytes in size.</Description>
<Archive sha1sum="da68915e3563b5244cbcdb6c7e20fb35559bcfc6" type="targz">https://sqlite.org/2018/sqlite-autoconf-3240000.tar.gz</Archive>
<Archive sha1sum="9684d06b7e6ec1868b1ef075993dc29d952dac97" type="zip">https://sqlite.org/2018/sqlite-doc-3240000.zip</Archive>
<Archive sha1sum="9af2df1a6da5db6e2ecf3f463625f16740e036e9" type="targz">https://sqlite.org/2018/sqlite-autoconf-3260000.tar.gz</Archive>
<Archive sha1sum="13c48e0396d15f3f4978214e144445031a23d509" type="zip">https://sqlite.org/2018/sqlite-doc-3260000.zip</Archive>
<BuildDependencies>
<Dependency>readline-devel</Dependency>
</BuildDependencies>
@@ -104,6 +104,13 @@
</Package>
<History>
<Update release="11">
<Date>2018-12-11</Date>
<Version>3.26.0</Version>
<Comment>Rebuild</Comment>
<Name>Ertuğrul Erata</Name>
<Email>ertugrulerata@gmail.com</Email>
</Update>
<Update release="10">
<Date>2018-07-15</Date>
<Version>3.24.0</Version>
system/base/timezone/pspec.xml
+8 -1
View File
@@ -14,7 +14,7 @@
<IsA>data</IsA>
<Summary>Timezone data files and tools</Summary>
<Description>timezone includes timezone data files and tools to use them. Package contents are synchronized with glibc tree.</Description>
<Archive sha1sum="ed84663439056a9ef1b3a5cdd7715ad5b2e3c568" type="targz">http://www.iana.org/time-zones/repository/releases/tzdata2018c.tar.gz</Archive>
<Archive sha1sum="9ab1932256674075fb74ff84792582b5ac12c476" type="targz">http://www.iana.org/time-zones/repository/releases/tzdata2018e.tar.gz</Archive>
<BuildDependencies>
<Dependency>perl</Dependency>
<Dependency>gawk</Dependency>
@@ -36,6 +36,13 @@
</Package>
<History>
<Update release="7">
<Date>2018-11-29</Date>
<Version>2018e</Version>
<Comment>Version bump.</Comment>
<Name>Ertuğrul Erata</Name>
<Email>ertugrulerata@gmail.com</Email>
</Update>
<Update release="6">
<Date>2018-07-15</Date>
<Version>2018c</Version>
system/base/xz/pspec.xml
+8 -1
View File
@@ -15,7 +15,7 @@
<IsA>library</IsA>
<Summary>XZ compression utilities</Summary>
<Description>XZ Utils provide a general purpose data compression library and command line tools. The .xz format supports multiple compression algorithms, which are called "filters" in context of XZ Utils. The primary filter is currently LZMA2.</Description>
<Archive sha1sum="a2975d12e0905daec48ec87c0098602e0669d195" type="tarxz">http://tukaani.org/xz/xz-5.2.3.tar.xz</Archive>
<Archive sha1sum="1d3a6910c28d40df0134f4a49e5570e8249120c5" type="tarxz">http://tukaani.org/xz/xz-5.2.4.tar.xz</Archive>
</Source>
<Package>
@@ -61,6 +61,13 @@
</Package>
<History>
<Update release="5">
<Date>2018-11-28</Date>
<Version>5.2.4</Version>
<Comment>Version bump.</Comment>
<Name>Ertuğrul Erata</Name>
<Email>ertugrulerata@gmail.com</Email>
</Update>
<Update release="4">
<Date>2018-07-15</Date>
<Version>5.2.3</Version>
system/devel/bison/pspec.xml
+8 -1
View File
@@ -12,7 +12,7 @@
<IsA>app:console</IsA>
<Summary>A yacc-compatible parser generator</Summary>
<Description>A yacc-compatible parser generator. Once you are proficient with Bison, you can use it to develop a wide range of language parsers, from those used in simple desk calculators to complex programming languages</Description>
<Archive sha1sum="8270497aad88c7dd4f2c317298c50513fb0c3c8e" type="tarxz">mirrors://gnu/bison/bison-3.0.4.tar.xz</Archive>
<Archive sha1sum="45e904d04d88c821df95833c4be4414ce5a47a4b" type="tarxz">mirrors://gnu/bison/bison-3.0.5.tar.xz</Archive>
<BuildDependencies>
<Dependency>m4</Dependency>
<Dependency>gettext</Dependency>
@@ -40,6 +40,13 @@
</Package>
<History>
<Update release="5">
<Date>2018-11-29</Date>
<Version>3.0.5</Version>
<Comment>Version bump.</Comment>
<Name>Ertuğrul Erata</Name>
<Email>ertugrulerata@gmail.com</Email>
</Update>
<Update release="4">
<Date>2018-07-15</Date>
<Version>3.0.4</Version>
system/devel/elfutils/pspec.xml
+8 -1
View File
@@ -13,7 +13,7 @@
<IsA>library</IsA>
<Summary>Libraries/utilities to handle ELF objects</Summary>
<Description>elfutils contains libraries and utilities to handle ELF objects and is a replacement for libelf.</Description>
<Archive sha1sum="f30edf62e2d8174dff70bcfcf5bf48a1e6644478" type="tarbz2">ftp://sourceware.org/pub/elfutils/0.171/elfutils-0.171.tar.bz2</Archive>
<Archive sha1sum="eeae78cc313418da7daf0008e4cc8e6fd19926aa" type="tarbz2">ftp://sourceware.org/pub/elfutils/0.173/elfutils-0.173.tar.bz2</Archive>
<BuildDependencies>
<Dependency>bzip2</Dependency>
<Dependency>xz-devel</Dependency>
@@ -58,6 +58,13 @@
</Package>
<History>
<Update release="7">
<Date>2018-11-29</Date>
<Version>0.173</Version>
<Comment>Version bump.</Comment>
<Name>Ertuğrul Erata</Name>
<Email>ertugrulerata@gmail.com</Email>
</Update>
<Update release="6">
<Date>2018-07-15</Date>
<Version>0.171</Version>