[gentoo-commits] proj/musl:master commit in: sys-libs/libapparmor/files/, sys-libs/libapparmor/

2018-04-27 Thread Anthony G. Basile 
commit: 7093f9a3727bb7d5cdc9a9d83a9109414e86bb6c
Author: Anthony G. Basile  gentoo  org>
AuthorDate: Fri Apr 27 22:03:32 2018 +
Commit: Anthony G. Basile  gentoo  org>
CommitDate: Fri Apr 27 22:03:32 2018 +
URL:https://gitweb.gentoo.org/proj/musl.git/commit/?id=7093f9a3

Revert "libapparmor"

This reverts commit 2485547768696f2341cb011a596001deec0be271.

 sys-libs/libapparmor/Manifest  |   4 -
 .../libapparmor/files/libapparmor-2.12-musl.patch  | 163 -
 sys-libs/libapparmor/libapparmor-2.12.0.ebuild |  95 
 sys-libs/libapparmor/metadata.xml  |  14 --
 4 files changed, 276 deletions(-)

diff --git a/sys-libs/libapparmor/Manifest b/sys-libs/libapparmor/Manifest
deleted file mode 100644
index f81d0a1..000
--- a/sys-libs/libapparmor/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX libapparmor-2.12-musl.patch 3985 BLAKE2B 
011f4fa5ef60156510918624bba6b88c5b4335b02cb078f5b8c79071c97bd5c2f1cd2091580d8770133ca22217e4c26cd9f96b9bc8a01b8f719a2e6ff85efabb
 SHA512 
2498ac90882c36d63a54017486e0a750bcc5feff87bd265f6098366cd633315fce884c208fd9f431a9aca9c1c9b60f941b28c16aff0a82543d99605e8d7582a5
-DIST apparmor-2.12.tar.gz 7258450 BLAKE2B 
c1d4e01d836c5f567ddb7c5ecf36dde6efccf1e59ae219824129fd5c92162a3fed7ebdc492f181ae132b07db068660078a9631543d40fd20ab0b44cd4c646d4c
 SHA512 
d85fd47c66333fe5658ee5e977b32142697f6e36c575550712ee2ace2ad0fbf2aa59c8fd3b82ad8821c0190adf8cc150cf623ea09a84d5b32bde050a03dd6e9a
-EBUILD libapparmor-2.12.0.ebuild 2117 BLAKE2B 
89c78a072c2c03b9d1542ddf36e1ba9990ab53e6fcef9f54554e28fa2d7ded4bedf2c154767b529938bd326552d839a5f2e655c6d463e2691c291fc30b2553bc
 SHA512 
45e04eafa5c3eb66d056779aa9d3a6f95d4abbe8fe1ced37bb0ac4c7219accad80a9af3811a31705ab1e9ff399f19fb038711297ba9f1a75bb06a7ca861cdc95
-MISC metadata.xml 409 BLAKE2B 
63cb1726a015cf118e8ffcc8cf9d49795a75d367e36b0332fbf23faad8b3eed41e2ae090cc92757e12248d831e0ea1782b6f275ef02b7d2d2022bf2b79f69042
 SHA512 
a66647c5e40f2593017942c12786dc30995e7980fdb58c1de0b9ae34069434cb5a4c70b2bd268a239df82edfcc1e7288e8033bf57609f757a321639afd5e78b8

diff --git a/sys-libs/libapparmor/files/libapparmor-2.12-musl.patch 
b/sys-libs/libapparmor/files/libapparmor-2.12-musl.patch
deleted file mode 100644
index d2bc594..000
--- a/sys-libs/libapparmor/files/libapparmor-2.12-musl.patch
+++ /dev/null
@@ -1,163 +0,0 @@
 a/configure.ac 2018-04-15 04:23:39.953481823 +
-+++ b/configure.ac 2018-04-15 04:33:34.474448938 +
-@@ -81,7 +81,7 @@
- AC_HEADER_STDC
- AC_CHECK_HEADERS(unistd.h stdint.h syslog.h)
- 
--AC_CHECK_FUNCS([asprintf __secure_getenv secure_getenv])
-+AC_CHECK_FUNCS([asprintf __secure_getenv secure_getenv scandirat])
- 
- AM_PROG_CC_C_O
- AC_C_CONST
 a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -46,9 +46,9 @@
-LC_ALL=C  sed  -n -e "/IPPROTO_MAX/d"  -e "s/^\#define[ 
\\t]\\+IPPROTO_\\([A-Z0-9_]\\+\\)\\(.*\\)$$/AA_GEN_PROTO_ENT(\\UIPPROTO_\\1, 
\"\\L\\1\")/p" $< > $@
- 
- lib_LTLIBRARIES = libapparmor.la
--noinst_HEADERS = grammar.h parser.h scanner.h af_protos.h private.h
-+noinst_HEADERS = grammar.h parser.h scanner.h af_protos.h secure_getenv.h 
scandirat.h private.h
- 
--libapparmor_la_SOURCES = grammar.y libaalogparse.c kernel.c scanner.c 
private.c features.c kernel_interface.c policy_cache.c
-+libapparmor_la_SOURCES = grammar.y libaalogparse.c kernel.c scanner.c 
secure_getenv.c scandirat.c private.c features.c kernel_interface.c 
policy_cache.c
- libapparmor_la_LDFLAGS = -version-info 
$(AA_LIB_CURRENT):$(AA_LIB_REVISION):$(AA_LIB_AGE) -XCClinker -dynamic -pthread 
\
-   -Wl,--version-script=$(top_srcdir)/src/libapparmor.map
- 
 a/src/private.c
-+++ b/src/private.c
-@@ -39,10 +39,14 @@
-  #ifdef HAVE___SECURE_GETENV
-   #define secure_getenv __secure_getenv
-  #else
--  #error neither secure_getenv nor __secure_getenv is available
-+  #include "secure_getenv.h"
-  #endif
- #endif
- 
-+#ifndef HAVE_SCANDIRAT
-+#include "scandirat.h"
-+#endif
-+
- struct ignored_suffix_t {
-   const char * text;
-   int len;
 /dev/null
-+++ b/src/scandirat.c
-@@ -0,0 +1,62 @@
-+#include 
-+#include 
-+#include 
-+#include 
-+#include 
-+#include 
-+#include 
-+
-+#include "scandirat.h"
-+
-+#ifndef HAVE_SCANDIRAT
-+
-+int scandirat(int dir_fd, const char *dirp, struct dirent ***namelist,
-+  int (*filter)(const struct dirent *),
-+  int (*compar)(const struct dirent **, const struct dirent **))
-+{
-+  int fd;
-+  DIR *d;
-+  struct dirent *de, **names=0, **tmp;
-+  size_t cnt=0, len=0;
-+  int old_errno = errno;
-+
-+
-+  fd = openat(dir_fd, dirp, O_RDONLY|O_CLOEXEC);
-+  if (fd == -1) return -1;
-+
-+  d = fdopendir(fd);
-+
-+  if (!d) {
-+  close(fd);
-+  return -1;
-+  }
-+
-+  while ((errno=0), (de = readdir(d))) {
-+  if (filter && !filter(de)) continue;
-+  if (cnt >= len) {
-+  len = 2*len+1;
-+

[gentoo-commits] proj/musl:master commit in: sys-libs/libapparmor/files/, sys-libs/libapparmor/

2018-04-27 Thread Anthony G. Basile 
commit: 3cc7f92150b12b0a597a81618ff8ffa892e89b41
Author: Anthony G. Basile  gentoo  org>
AuthorDate: Fri Apr 27 22:03:23 2018 +
Commit: Anthony G. Basile  gentoo  org>
CommitDate: Fri Apr 27 22:03:23 2018 +
URL:https://gitweb.gentoo.org/proj/musl.git/commit/?id=3cc7f921

Revert "sys-libs/libapparmor: fix white space"

This reverts commit 05ca4ad33a734b9c9f7c40bb6475b70fb745af11.

 sys-libs/libapparmor/Manifest  | 3 +++
 sys-libs/libapparmor/files/libapparmor-2.12-musl.patch | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/sys-libs/libapparmor/Manifest b/sys-libs/libapparmor/Manifest
index 0a6a3ee..f81d0a1 100644
--- a/sys-libs/libapparmor/Manifest
+++ b/sys-libs/libapparmor/Manifest
@@ -1 +1,4 @@
+AUX libapparmor-2.12-musl.patch 3985 BLAKE2B 
011f4fa5ef60156510918624bba6b88c5b4335b02cb078f5b8c79071c97bd5c2f1cd2091580d8770133ca22217e4c26cd9f96b9bc8a01b8f719a2e6ff85efabb
 SHA512 
2498ac90882c36d63a54017486e0a750bcc5feff87bd265f6098366cd633315fce884c208fd9f431a9aca9c1c9b60f941b28c16aff0a82543d99605e8d7582a5
 DIST apparmor-2.12.tar.gz 7258450 BLAKE2B 
c1d4e01d836c5f567ddb7c5ecf36dde6efccf1e59ae219824129fd5c92162a3fed7ebdc492f181ae132b07db068660078a9631543d40fd20ab0b44cd4c646d4c
 SHA512 
d85fd47c66333fe5658ee5e977b32142697f6e36c575550712ee2ace2ad0fbf2aa59c8fd3b82ad8821c0190adf8cc150cf623ea09a84d5b32bde050a03dd6e9a
+EBUILD libapparmor-2.12.0.ebuild 2117 BLAKE2B 
89c78a072c2c03b9d1542ddf36e1ba9990ab53e6fcef9f54554e28fa2d7ded4bedf2c154767b529938bd326552d839a5f2e655c6d463e2691c291fc30b2553bc
 SHA512 
45e04eafa5c3eb66d056779aa9d3a6f95d4abbe8fe1ced37bb0ac4c7219accad80a9af3811a31705ab1e9ff399f19fb038711297ba9f1a75bb06a7ca861cdc95
+MISC metadata.xml 409 BLAKE2B 
63cb1726a015cf118e8ffcc8cf9d49795a75d367e36b0332fbf23faad8b3eed41e2ae090cc92757e12248d831e0ea1782b6f275ef02b7d2d2022bf2b79f69042
 SHA512 
a66647c5e40f2593017942c12786dc30995e7980fdb58c1de0b9ae34069434cb5a4c70b2bd268a239df82edfcc1e7288e8033bf57609f757a321639afd5e78b8

diff --git a/sys-libs/libapparmor/files/libapparmor-2.12-musl.patch 
b/sys-libs/libapparmor/files/libapparmor-2.12-musl.patch
index a71bf5f..d2bc594 100644
--- a/sys-libs/libapparmor/files/libapparmor-2.12-musl.patch
+++ b/sys-libs/libapparmor/files/libapparmor-2.12-musl.patch
@@ -24,7 +24,7 @@
-Wl,--version-script=$(top_srcdir)/src/libapparmor.map
  
 --- a/src/private.c
-+++ b/src/private.c
 b/src/private.c
 @@ -39,10 +39,14 @@
   #ifdef HAVE___SECURE_GETENV
#define secure_getenv __secure_getenv

[gentoo-commits] proj/musl:master commit in: sys-libs/libapparmor/files/, sys-libs/libapparmor/

2018-04-27 Thread Anthony G. Basile 
commit: 2485547768696f2341cb011a596001deec0be271
Author: g3ngr33n  gmx  com>
AuthorDate: Fri Apr 27 18:38:04 2018 +
Commit: Anthony G. Basile  gentoo  org>
CommitDate: Fri Apr 27 20:02:30 2018 +
URL:https://gitweb.gentoo.org/proj/musl.git/commit/?id=24855477

libapparmor

Signed-off-by: Anthony G. Basile  gentoo.org>

 sys-libs/libapparmor/Manifest  |   4 +
 .../libapparmor/files/libapparmor-2.12-musl.patch  | 163 +
 sys-libs/libapparmor/libapparmor-2.12.0.ebuild |  95 
 sys-libs/libapparmor/metadata.xml  |  14 ++
 4 files changed, 276 insertions(+)

diff --git a/sys-libs/libapparmor/Manifest b/sys-libs/libapparmor/Manifest
new file mode 100644
index 000..f81d0a1
--- /dev/null
+++ b/sys-libs/libapparmor/Manifest
@@ -0,0 +1,4 @@
+AUX libapparmor-2.12-musl.patch 3985 BLAKE2B 
011f4fa5ef60156510918624bba6b88c5b4335b02cb078f5b8c79071c97bd5c2f1cd2091580d8770133ca22217e4c26cd9f96b9bc8a01b8f719a2e6ff85efabb
 SHA512 
2498ac90882c36d63a54017486e0a750bcc5feff87bd265f6098366cd633315fce884c208fd9f431a9aca9c1c9b60f941b28c16aff0a82543d99605e8d7582a5
+DIST apparmor-2.12.tar.gz 7258450 BLAKE2B 
c1d4e01d836c5f567ddb7c5ecf36dde6efccf1e59ae219824129fd5c92162a3fed7ebdc492f181ae132b07db068660078a9631543d40fd20ab0b44cd4c646d4c
 SHA512 
d85fd47c66333fe5658ee5e977b32142697f6e36c575550712ee2ace2ad0fbf2aa59c8fd3b82ad8821c0190adf8cc150cf623ea09a84d5b32bde050a03dd6e9a
+EBUILD libapparmor-2.12.0.ebuild 2117 BLAKE2B 
89c78a072c2c03b9d1542ddf36e1ba9990ab53e6fcef9f54554e28fa2d7ded4bedf2c154767b529938bd326552d839a5f2e655c6d463e2691c291fc30b2553bc
 SHA512 
45e04eafa5c3eb66d056779aa9d3a6f95d4abbe8fe1ced37bb0ac4c7219accad80a9af3811a31705ab1e9ff399f19fb038711297ba9f1a75bb06a7ca861cdc95
+MISC metadata.xml 409 BLAKE2B 
63cb1726a015cf118e8ffcc8cf9d49795a75d367e36b0332fbf23faad8b3eed41e2ae090cc92757e12248d831e0ea1782b6f275ef02b7d2d2022bf2b79f69042
 SHA512 
a66647c5e40f2593017942c12786dc30995e7980fdb58c1de0b9ae34069434cb5a4c70b2bd268a239df82edfcc1e7288e8033bf57609f757a321639afd5e78b8

diff --git a/sys-libs/libapparmor/files/libapparmor-2.12-musl.patch 
b/sys-libs/libapparmor/files/libapparmor-2.12-musl.patch
new file mode 100644
index 000..d2bc594
--- /dev/null
+++ b/sys-libs/libapparmor/files/libapparmor-2.12-musl.patch
@@ -0,0 +1,163 @@
+--- a/configure.ac 2018-04-15 04:23:39.953481823 +
 b/configure.ac 2018-04-15 04:33:34.474448938 +
+@@ -81,7 +81,7 @@
+ AC_HEADER_STDC
+ AC_CHECK_HEADERS(unistd.h stdint.h syslog.h)
+ 
+-AC_CHECK_FUNCS([asprintf __secure_getenv secure_getenv])
++AC_CHECK_FUNCS([asprintf __secure_getenv secure_getenv scandirat])
+ 
+ AM_PROG_CC_C_O
+ AC_C_CONST
+--- a/src/Makefile.am
 b/src/Makefile.am
+@@ -46,9 +46,9 @@
+LC_ALL=C  sed  -n -e "/IPPROTO_MAX/d"  -e "s/^\#define[ 
\\t]\\+IPPROTO_\\([A-Z0-9_]\\+\\)\\(.*\\)$$/AA_GEN_PROTO_ENT(\\UIPPROTO_\\1, 
\"\\L\\1\")/p" $< > $@
+ 
+ lib_LTLIBRARIES = libapparmor.la
+-noinst_HEADERS = grammar.h parser.h scanner.h af_protos.h private.h
++noinst_HEADERS = grammar.h parser.h scanner.h af_protos.h secure_getenv.h 
scandirat.h private.h
+ 
+-libapparmor_la_SOURCES = grammar.y libaalogparse.c kernel.c scanner.c 
private.c features.c kernel_interface.c policy_cache.c
++libapparmor_la_SOURCES = grammar.y libaalogparse.c kernel.c scanner.c 
secure_getenv.c scandirat.c private.c features.c kernel_interface.c 
policy_cache.c
+ libapparmor_la_LDFLAGS = -version-info 
$(AA_LIB_CURRENT):$(AA_LIB_REVISION):$(AA_LIB_AGE) -XCClinker -dynamic -pthread 
\
+   -Wl,--version-script=$(top_srcdir)/src/libapparmor.map
+ 
+--- a/src/private.c
 b/src/private.c
+@@ -39,10 +39,14 @@
+  #ifdef HAVE___SECURE_GETENV
+   #define secure_getenv __secure_getenv
+  #else
+-  #error neither secure_getenv nor __secure_getenv is available
++  #include "secure_getenv.h"
+  #endif
+ #endif
+ 
++#ifndef HAVE_SCANDIRAT
++#include "scandirat.h"
++#endif
++
+ struct ignored_suffix_t {
+   const char * text;
+   int len;
+--- /dev/null
 b/src/scandirat.c
+@@ -0,0 +1,62 @@
++#include 
++#include 
++#include 
++#include 
++#include 
++#include 
++#include 
++
++#include "scandirat.h"
++
++#ifndef HAVE_SCANDIRAT
++
++int scandirat(int dir_fd, const char *dirp, struct dirent ***namelist,
++  int (*filter)(const struct dirent *),
++  int (*compar)(const struct dirent **, const struct dirent **))
++{
++  int fd;
++  DIR *d;
++  struct dirent *de, **names=0, **tmp;
++  size_t cnt=0, len=0;
++  int old_errno = errno;
++
++
++  fd = openat(dir_fd, dirp, O_RDONLY|O_CLOEXEC);
++  if (fd == -1) return -1;
++
++  d = fdopendir(fd);
++
++  if (!d) {
++  close(fd);
++  return -1;
++  }
++
++  while ((errno=0), (de = readdir(d))) {
++  if (filter && !filter(de)) continue;
++  if (cnt >= len) {
++  len = 2*len+1;
++  if (len > SIZE_MAX/sizeof

[gentoo-commits] proj/musl:master commit in: sys-libs/libapparmor/files/, sys-libs/libapparmor/

2018-04-27 Thread Anthony G. Basile 
commit: 05ca4ad33a734b9c9f7c40bb6475b70fb745af11
Author: Anthony G. Basile  gentoo  org>
AuthorDate: Fri Apr 27 20:07:01 2018 +
Commit: Anthony G. Basile  gentoo  org>
CommitDate: Fri Apr 27 20:07:01 2018 +
URL:https://gitweb.gentoo.org/proj/musl.git/commit/?id=05ca4ad3

sys-libs/libapparmor: fix white space

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 sys-libs/libapparmor/Manifest  | 3 ---
 sys-libs/libapparmor/files/libapparmor-2.12-musl.patch | 2 +-
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/sys-libs/libapparmor/Manifest b/sys-libs/libapparmor/Manifest
index f81d0a1..0a6a3ee 100644
--- a/sys-libs/libapparmor/Manifest
+++ b/sys-libs/libapparmor/Manifest
@@ -1,4 +1 @@
-AUX libapparmor-2.12-musl.patch 3985 BLAKE2B 
011f4fa5ef60156510918624bba6b88c5b4335b02cb078f5b8c79071c97bd5c2f1cd2091580d8770133ca22217e4c26cd9f96b9bc8a01b8f719a2e6ff85efabb
 SHA512 
2498ac90882c36d63a54017486e0a750bcc5feff87bd265f6098366cd633315fce884c208fd9f431a9aca9c1c9b60f941b28c16aff0a82543d99605e8d7582a5
 DIST apparmor-2.12.tar.gz 7258450 BLAKE2B 
c1d4e01d836c5f567ddb7c5ecf36dde6efccf1e59ae219824129fd5c92162a3fed7ebdc492f181ae132b07db068660078a9631543d40fd20ab0b44cd4c646d4c
 SHA512 
d85fd47c66333fe5658ee5e977b32142697f6e36c575550712ee2ace2ad0fbf2aa59c8fd3b82ad8821c0190adf8cc150cf623ea09a84d5b32bde050a03dd6e9a
-EBUILD libapparmor-2.12.0.ebuild 2117 BLAKE2B 
89c78a072c2c03b9d1542ddf36e1ba9990ab53e6fcef9f54554e28fa2d7ded4bedf2c154767b529938bd326552d839a5f2e655c6d463e2691c291fc30b2553bc
 SHA512 
45e04eafa5c3eb66d056779aa9d3a6f95d4abbe8fe1ced37bb0ac4c7219accad80a9af3811a31705ab1e9ff399f19fb038711297ba9f1a75bb06a7ca861cdc95
-MISC metadata.xml 409 BLAKE2B 
63cb1726a015cf118e8ffcc8cf9d49795a75d367e36b0332fbf23faad8b3eed41e2ae090cc92757e12248d831e0ea1782b6f275ef02b7d2d2022bf2b79f69042
 SHA512 
a66647c5e40f2593017942c12786dc30995e7980fdb58c1de0b9ae34069434cb5a4c70b2bd268a239df82edfcc1e7288e8033bf57609f757a321639afd5e78b8

diff --git a/sys-libs/libapparmor/files/libapparmor-2.12-musl.patch 
b/sys-libs/libapparmor/files/libapparmor-2.12-musl.patch
index d2bc594..a71bf5f 100644
--- a/sys-libs/libapparmor/files/libapparmor-2.12-musl.patch
+++ b/sys-libs/libapparmor/files/libapparmor-2.12-musl.patch
@@ -24,7 +24,7 @@
-Wl,--version-script=$(top_srcdir)/src/libapparmor.map
  
 --- a/src/private.c
-+++ b/src/private.c
 b/src/private.c
 @@ -39,10 +39,14 @@
   #ifdef HAVE___SECURE_GETENV
#define secure_getenv __secure_getenv