commit: abcaa05b4a2ac614f4b63e6345ba5fa15207f537
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 12 16:55:09 2014 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Fri Dec 12 16:55:09 2014 +0000
URL:
http://sources.gentoo.org/gitweb/?p=proj/releng.git;a=commit;h=abcaa05b
tools-uclibc/desktop: update build
---
tools-uclibc/desktop/config | 3 +-
.../xfce4/panel/launcher-18/13732417901.desktop | 17 -----------
.../xfce4/panel/launcher-18/14180858892.desktop | 31 ++++++++++++++++++++
.../xfconf/xfce-perchannel-xml/xfce4-panel.xml | 2 +-
.../desktop/portage/package.accept_keywords/midori | 1 +
tools-uclibc/desktop/portage/package.use/openssh | 1 +
.../uclibc/98-revert-fix-prelink-dlclose.patch | 33 ++++++++++++++++++++++
tools-uclibc/desktop/world.1 | 2 +-
tools-uclibc/desktop/world.2 | 2 +-
9 files changed, 70 insertions(+), 22 deletions(-)
diff --git a/tools-uclibc/desktop/config b/tools-uclibc/desktop/config
index 0a18b79..494b6b8 100644
--- a/tools-uclibc/desktop/config
+++ b/tools-uclibc/desktop/config
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 3.17.2-hardened-r1 Kernel Configuration
+# Linux/x86 3.17.6-hardened Kernel Configuration
#
CONFIG_64BIT=y
CONFIG_X86_64=y
@@ -5958,7 +5958,6 @@ CONFIG_RTC_DRV_DS1742=m
CONFIG_RTC_DRV_DS2404=m
CONFIG_RTC_DRV_DA9052=m
CONFIG_RTC_DRV_DA9055=m
-CONFIG_RTC_DRV_EFI=m
CONFIG_RTC_DRV_STK17TA8=m
CONFIG_RTC_DRV_M48T86=m
CONFIG_RTC_DRV_M48T35=m
diff --git
a/tools-uclibc/desktop/gentoo/.config/xfce4/panel/launcher-18/13732417901.desktop
b/tools-uclibc/desktop/gentoo/.config/xfce4/panel/launcher-18/13732417901.desktop
deleted file mode 100644
index 86f9679..0000000
---
a/tools-uclibc/desktop/gentoo/.config/xfce4/panel/launcher-18/13732417901.desktop
+++ /dev/null
@@ -1,17 +0,0 @@
-[Desktop Entry]
-Name=Epiphany
-GenericName=Web Browser
-X-GNOME-FullName=Epiphany Web Browser
-Comment=Browse the web
-Exec=epiphany %U
-StartupNotify=true
-Terminal=false
-Type=Application
-Icon=gnome-web-browser
-X-GNOME-Bugzilla-Bugzilla=GNOME
-X-GNOME-Bugzilla-Product=epiphany
-X-GNOME-Bugzilla-Component=BugBuddyBugs
-X-GNOME-Bugzilla-Version=2.30.6
-Categories=Network;GNOME;GTK;WebBrowser;
-MimeType=text/html;text/xml;application/xhtml+xml;x-scheme-handler/http;x-scheme-handler/https;
-X-XFCE-Source=file:///usr/share/applications/epiphany.desktop
diff --git
a/tools-uclibc/desktop/gentoo/.config/xfce4/panel/launcher-18/14180858892.desktop
b/tools-uclibc/desktop/gentoo/.config/xfce4/panel/launcher-18/14180858892.desktop
new file mode 100644
index 0000000..9b0503e
--- /dev/null
+++
b/tools-uclibc/desktop/gentoo/.config/xfce4/panel/launcher-18/14180858892.desktop
@@ -0,0 +1,31 @@
+[Desktop Entry]
+Version=1.0
+Type=Application
+Name=Midori
+GenericName=Web Browser
+X-GNOME-Fullname=Midori Web Browser
+Comment=Browse the Web
+X-GNOME-Keywords=Internet;WWW;Explorer
+X-AppInstall-Keywords=Internet;WWW;Explorer
+Categories=GTK;Network;WebBrowser;
+MimeType=text/html;application/xhtml+xml;x-scheme-handler/http;x-scheme-handler/https;x-scheme-handler/geo;image/svg+xml;
+Exec=midori %U
+Icon=midori
+Terminal=false
+StartupNotify=true
+X-Osso-Type=application/x-executable
+X-Osso-Service=midori
+Actions=TabNew;WindowNew;Private;
+X-XFCE-Source=file:///usr/share/applications/midori.desktop
+
+[Desktop Action TabNew]
+Name=New Tab
+Exec=midori -e TabNew
+
+[Desktop Action WindowNew]
+Name=New Window
+Exec=midori -e WindowNew
+
+[Desktop Action Private]
+Name=New Private Browsing Window
+Exec=midori --private
diff --git
a/tools-uclibc/desktop/gentoo/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml
b/tools-uclibc/desktop/gentoo/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml
index 6e0cb9d..58ca671 100644
---
a/tools-uclibc/desktop/gentoo/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml
+++
b/tools-uclibc/desktop/gentoo/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml
@@ -98,7 +98,7 @@
</property>
<property name="plugin-18" type="string" value="launcher">
<property name="items" type="array">
- <value type="string" value="13732417901.desktop"/>
+ <value type="string" value="14180858892.desktop"/>
</property>
</property>
<property name="plugin-20" type="string" value="launcher">
diff --git a/tools-uclibc/desktop/portage/package.accept_keywords/midori
b/tools-uclibc/desktop/portage/package.accept_keywords/midori
new file mode 100644
index 0000000..83e8633
--- /dev/null
+++ b/tools-uclibc/desktop/portage/package.accept_keywords/midori
@@ -0,0 +1 @@
+www-client/midori ~amd64
diff --git a/tools-uclibc/desktop/portage/package.use/openssh
b/tools-uclibc/desktop/portage/package.use/openssh
new file mode 100644
index 0000000..0632a83
--- /dev/null
+++ b/tools-uclibc/desktop/portage/package.use/openssh
@@ -0,0 +1 @@
+net-misc/openssh -X509
diff --git
a/tools-uclibc/desktop/portage/patches/sys-libs/uclibc/98-revert-fix-prelink-dlclose.patch
b/tools-uclibc/desktop/portage/patches/sys-libs/uclibc/98-revert-fix-prelink-dlclose.patch
new file mode 100644
index 0000000..522b54d
--- /dev/null
+++
b/tools-uclibc/desktop/portage/patches/sys-libs/uclibc/98-revert-fix-prelink-dlclose.patch
@@ -0,0 +1,33 @@
+diff --git a/ldso/libdl/libdl.c b/ldso/libdl/libdl.c
+index 388e3c7..ad4370a 100644
+--- a/ldso/libdl/libdl.c
++++ b/ldso/libdl/libdl.c
+@@ -792,7 +792,7 @@ static int do_dlclose(void *vhandle, int need_fini)
+ int (*dl_elf_fini) (void);
+ void (*dl_brk) (void);
+ struct dyn_elf *handle;
+- unsigned int end = 0, start = 0xffffffff;
++ unsigned int end;
+ unsigned int i, j;
+ struct r_scope_elem *ls, *ls_next = NULL;
+ struct elf_resolve **handle_rlist;
+@@ -869,8 +869,6 @@ static int do_dlclose(void *vhandle, int need_fini)
+ i < tpnt->n_phent; ppnt++, i++) {
+ if (ppnt->p_type != PT_LOAD)
+ continue;
+- if (ppnt->p_vaddr < start)
+- start = ppnt->p_vaddr;
+ if (end < ppnt->p_vaddr + ppnt->p_memsz)
+ end = ppnt->p_vaddr + ppnt->p_memsz;
+ }
+@@ -977,9 +975,7 @@ static int do_dlclose(void *vhandle, int need_fini)
+ }
+ #endif
+
+- end = (end + ADDR_ALIGN) & PAGE_ALIGN;
+- start = start & ~ADDR_ALIGN;
+- DL_LIB_UNMAP (tpnt, end - start);
++ DL_LIB_UNMAP (tpnt, end - tpnt->mapaddr);
+ /* Free elements in RTLD_LOCAL scope list */
+ for (runp = tpnt->rtld_local; runp; runp = tmp) {
+ tmp = runp->next;
diff --git a/tools-uclibc/desktop/world.1 b/tools-uclibc/desktop/world.1
index e9d7d36..96ecc42 100644
--- a/tools-uclibc/desktop/world.1
+++ b/tools-uclibc/desktop/world.1
@@ -60,7 +60,7 @@ sys-process/lsof
virtual/libiconv
virtual/libintl
virtual/package-manager
-www-client/epiphany
+www-client/midori
x11-base/xorg-server
x11-libs/gksu
x11-misc/slim
diff --git a/tools-uclibc/desktop/world.2 b/tools-uclibc/desktop/world.2
index 9868062..97076c4 100644
--- a/tools-uclibc/desktop/world.2
+++ b/tools-uclibc/desktop/world.2
@@ -62,7 +62,7 @@ sys-process/lsof
virtual/libiconv
virtual/libintl
virtual/package-manager
-www-client/epiphany
+www-client/midori
x11-base/xorg-server
x11-libs/gksu
x11-misc/slim
