Исправлены Calculate патчи

mhiretskiy
parent d8b4949f23
commit 067a04e420

@ -1,22 +0,0 @@
# Calculate format=diff
diff --git a/src/eap_peer/Makefile b/src/eap_peer/Makefile
index 12e5f2c..584fc66 100644
--- src/eap_peer/Makefile
+++ src/eap_peer/Makefile
@@ -37,13 +37,15 @@ OBJS_both += ../utils/wpa_debug.o
OBJS_both += ../utils/base64.o
OBJS_both += ../utils/wpabuf.o
OBJS_both += ../utils/eloop.o
-OBJS_both += ../crypto/md5.o
ifneq ($(CONFIG_TLS), openssl)
OBJS_both += ../crypto/sha1.o
+OBJS_both += ../crypto/md5.o
endif
OBJS_both += ../crypto/sha1-tlsprf.o
OBJS_both += ../crypto/aes-encblock.o
+ifneq ($(CONFIG_TLS), openssl)
OBJS_both += ../crypto/aes-wrap.o
+endif
OBJS_both += ../crypto/aes-ctr.o
OBJS_both += ../crypto/aes-eax.o
OBJS_both += ../crypto/aes-omac1.o

@ -1,34 +0,0 @@
# Calculate format=diff
<pre>
--- src/palimpsest/gdu-section-drive.c 2010-03-14 22:50:51.000000000 +0300
+++ src/palimpsest/gdu-section-drive1.c 2011-10-22 04:40:33.000000000 +0400
@@ -429,6 +429,10 @@
launch_context = NULL;
app_info = G_APP_INFO (g_desktop_app_info_new ("brasero.desktop"));
+ if (app_info == NULL) app_info = G_APP_INFO (g_desktop_app_info_new ("xcdroast.desktop"));
+ if (app_info == NULL) app_info = G_APP_INFO (g_desktop_app_info_new ("gnomebaker.desktop"));
+ if (app_info == NULL) app_info = G_APP_INFO (g_desktop_app_info_new ("graveman.desktop"));
+ if (app_info == NULL) app_info = G_APP_INFO (g_desktop_app_info_new ("xfburn.desktop"));
if (app_info == NULL) {
/* TODO: Use PackageKit to install Brasero */
dialog = gtk_message_dialog_new_with_markup (GTK_WINDOW (gdu_shell_get_toplevel (gdu_section_get_shell (GDU_SECTION (section)))),
@@ -436,7 +440,7 @@
GTK_MESSAGE_ERROR,
GTK_BUTTONS_OK,
"<b><big><big>%s</big></big></b>\n\n%s",
- _("Error launching Brasero"),
+ _("Error launching CD/DVD burning program"),
_("The application is not installed"));
gtk_widget_show_all (dialog);
gtk_dialog_run (GTK_DIALOG (dialog));
@@ -456,7 +460,7 @@
GTK_MESSAGE_ERROR,
GTK_BUTTONS_OK,
"<b><big><big>%s</big></big></b>\n\n%s",
- _("Error launching Brasero"),
+ _("Error launching CD/DVD burning program"),
error->message);
g_error_free (error);
gtk_widget_show_all (dialog);
</pre>

@ -1,3 +0,0 @@
# Calculate multiline format=patch path=/linux-boot-probes/mounted/common
<reg>^(.*)&lt; ("\$mpoint/boot/grub/grub.cfg")</reg>
<text>sed -r '/BEGIN.*os-prober/,/END.*os-prober/d' \2 | \1</text>

@ -0,0 +1,15 @@
# Calculate format=patch
Исключить дублирование записей, при использовании одного и того же файла grub.cfg
diff --git a/linux-boot-probes/mounted/common/40grub2 b/linux-boot-probes/mounted/common/40grub2
index 885614e..e5064fb 100755
--- a/linux-boot-probes/mounted/common/40grub2
+++ b/linux-boot-probes/mounted/common/40grub2
@@ -97,7 +97,7 @@ if [ -e "$mpoint/boot/grub/grub.cfg" ] && \
([ ! -e "$mpoint/boot/grub/menu.lst" ] || \
[ "$mpoint/boot/grub/grub.cfg" -nt "$mpoint/boot/grub/menu.lst" ]); then
debug "parsing grub.cfg"
- parse_grub_menu "$mpoint" "$partition" "$bootpart" < "$mpoint/boot/grub/grub.cfg"
+ sed -r '/BEGIN.*os-prober/,/END.*os-prober/d' "$mpoint/boot/grub/grub.cfg" | parse_grub_menu "$mpoint" "$partition" "$bootpart"
elif [ -e "$mpoint/boot/grub2/grub.cfg" ]; then
debug "parsing grub.cfg"
parse_grub_menu "$mpoint" "$partition" "$bootpart" < "$mpoint/boot/grub2/grub.cfg"

@ -1,19 +0,0 @@
# Calculate format=diff
diff --git common.sh common.sh
index 30e245e..c295a15 100644
--- common.sh
+++ common.sh
@@ -147,12 +147,7 @@ unescape_mount () {
}
ro_partition () {
- if type blockdev >/dev/null 2>&1 && \
- [ "$(blockdev --getro "$1")" = 0 ] && \
- blockdev --setro "$1"; then
- cleanup_ro_partitions="${cleanup_ro_partitions:+$cleanup_ro_partitions }$1"
- trap cleanup EXIT HUP INT QUIT TERM
- fi
+ :
}
find_label () {

@ -1,26 +0,0 @@
# Calculate merge(sys-kernel/dracut)>=44 format=diff
diff --git a/dracut-044-orig/dracut.sh b/dracut-044/dracut.sh
index a2fc496..d3ec592 100755
--- a/dracut-044-orig/dracut.sh
+++ b/dracut-044/dracut.sh
@@ -1554,13 +1554,18 @@ PRELINK_BIN="$(command -v prelink)"
if [[ $UID = 0 ]] && [[ $PRELINK_BIN ]]; then
if [[ $DRACUT_FIPS_MODE ]]; then
dinfo "*** Installing prelink files ***"
- inst_multiple -o prelink /etc/prelink.conf /etc/prelink.conf.d/*.conf /etc/prelink.cache
+ inst_multiple -o prelink /etc/prelink.conf /etc/prelink.conf.d/*.conf /etc/prelink.cache /lib*/libelf*.so* /usr/lib*/libelf*.so*
elif [[ $do_prelink == yes ]]; then
dinfo "*** Pre-linking files ***"
- inst_multiple -o prelink /etc/prelink.conf /etc/prelink.conf.d/*.conf
+ inst_multiple -o prelink /etc/prelink.conf /etc/prelink.conf.d/*.conf /lib*/libelf*.so* /usr/lib*/libelf*.so*
+ [[ -d $initdir/proc ]] || mkdir $initdir/proc
+ mount -n -t proc none $initdir/proc
chroot "$initdir" "$PRELINK_BIN" -a
+ umount -n $initdir/proc
rm -f -- "$initdir/$PRELINK_BIN"
rm -fr -- "$initdir"/etc/prelink.*
+ rm -f -- "$initdir"/usr/lib*/libelf*.so*
+ rm -f -- "$initdir"/lib*/libelf*.so*
dinfo "*** Pre-linking files done ***"
fi
fi

@ -1,4 +1,5 @@
# Calculate format=diff
Патч для загрузки с неполных raid массивов
diff --git modules.d/90mdraid/parse-md.sh modules.d/90mdraid/parse-md.sh
index dd7bda2..3c88b6f 100755
--- modules.d/90mdraid/parse-md.sh

@ -1,18 +0,0 @@
# Calculate format=diff
diff --git a/src/compositor.c b/src/compositor.c
index 1bf3322..37df1a4 100644
--- a/src/compositor.c
+++ b/src/compositor.c
@@ -861,9 +861,9 @@ root_tile (ScreenInfo *screen_info)
XRenderColor c;
/* Background default to just plain ugly grey */
- c.red = 0x7f00;
- c.green = 0x7f00;
- c.blue = 0x7f00;
+ c.red = 0x0000;
+ c.green = 0x0000;
+ c.blue = 0x0000;
c.alpha = 0xffff;
picture = XRenderCreateSolidFill (dpy, &c);
}
Loading…
Cancel
Save