From d7c31e6a96fa00addeeb91ab637c6c9251493bdc8b70de7df9c0d28d3a76c115 Mon Sep 17 00:00:00 2001 From: Dirk Stoecker Date: Wed, 26 Feb 2014 20:02:33 +0000 Subject: [PATCH 1/6] Accepting request 223247 from home:robinroth:branches:editors This patch of the vim.spec file removes the "--without-x" flag and thus enables xterm_clipboard again, restoring features present in openSuSE 12.3. See also https://bugzilla.novell.com/show_bug.cgi?id=853072 OBS-URL: https://build.opensuse.org/request/show/223247 OBS-URL: https://build.opensuse.org/package/show/editors/vim?expand=0&rev=195 --- vim.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vim.spec b/vim.spec index 9deb9c3..62e1079 100644 --- a/vim.spec +++ b/vim.spec @@ -235,7 +235,7 @@ autoconf popd # build vim -%configure ${COMMON_OPTIONS} --without-x --disable-gui --disable-gpm +%configure ${COMMON_OPTIONS} --disable-gui --disable-gpm sed -i -e 's|define HAVE_DATE_TIME 1|undef HAVE_DATE_TIME|' src/auto/config.h %make cp src/vim vim From e36ebaa788d4c6b468c219bc88b01e2ca9ae2abb7f0831b29443d17978f1baec Mon Sep 17 00:00:00 2001 From: Dirk Stoecker Date: Wed, 26 Feb 2014 20:03:43 +0000 Subject: [PATCH 2/6] Accepting request 223997 from home:cboltz:branches:editors - Updated apparmor.vim (taken from AppArmor 2.8.3) * Fixes the attach_disconnected flag OBS-URL: https://build.opensuse.org/request/show/223997 OBS-URL: https://build.opensuse.org/package/show/editors/vim?expand=0&rev=196 --- apparmor.vim | 10 +++++----- vim.changes | 6 ++++++ 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/apparmor.vim b/apparmor.vim index 4570866..515805e 100644 --- a/apparmor.vim +++ b/apparmor.vim @@ -213,14 +213,14 @@ syn match sdExtHat /\v^\s+(\^|profile\s+)\S+\s*,(\s*$|(\s*#.*$)\@=)/ contains=s -syn match sdProfileName /\v^((profile\s+)?\/\S+|profile\s+([a-zA-Z0-9]\S*\s)?\S+)\s+((flags\s*\=\s*)?\(\s*(complain|audit|attach_disconnect|no_attach_disconnected|chroot_attach|chroot_no_attach|chroot_relative|namespace_relative)(\s*,\s*(complain|audit|attach_disconnect|no_attach_disconnected|chroot_attach|chroot_no_attach|chroot_relative|namespace_relative))*\s*\)\s+)=\{/ contains=sdProfileStart,sdHatName,sdFlags,sdComment,sdGlob +syn match sdProfileName /\v^((profile\s+)?\/\S+|profile\s+([a-zA-Z0-9]\S*\s)?\S+)\s+((flags\s*\=\s*)?\(\s*(complain|audit|attach_disconnected|no_attach_disconnected|chroot_attach|chroot_no_attach|chroot_relative|namespace_relative)(\s*,\s*(complain|audit|attach_disconnected|no_attach_disconnected|chroot_attach|chroot_no_attach|chroot_relative|namespace_relative))*\s*\)\s+)=\{/ contains=sdProfileStart,sdHatName,sdFlags,sdComment,sdGlob syn match sdProfileStart /{/ contained syn match sdProfileEnd /^}\s*(#.*)?$/ contained " TODO: syn region does not (yet?) allow usage of comment in end= " TODO: Removing the $ mark from end= will allow non-comments also :-( -syn match sdHatName /\v^\s+(\^|profile\s+)\S+\s+((flags\s*\=\s*)?\(\s*(complain|audit|attach_disconnect|no_attach_disconnected|chroot_attach|chroot_no_attach|chroot_relative|namespace_relative)(\s*,\s*(complain|audit|attach_disconnect|no_attach_disconnected|chroot_attach|chroot_no_attach|chroot_relative|namespace_relative))*\s*\)\s+)=\{/ contains=sdProfileStart,sdFlags,sdComment +syn match sdHatName /\v^\s+(\^|profile\s+)\S+\s+((flags\s*\=\s*)?\(\s*(complain|audit|attach_disconnected|no_attach_disconnected|chroot_attach|chroot_no_attach|chroot_relative|namespace_relative)(\s*,\s*(complain|audit|attach_disconnected|no_attach_disconnected|chroot_attach|chroot_no_attach|chroot_relative|namespace_relative))*\s*\)\s+)=\{/ contains=sdProfileStart,sdFlags,sdComment syn match sdHatStart /{/ contained syn match sdHatEnd /}/ contained " TODO: allow comments + [same as for syn match sdProfileEnd] -syn match sdFlags /\v((flags\s*\=\s*)?\(\s*(complain|audit|attach_disconnect|no_attach_disconnected|chroot_attach|chroot_no_attach|chroot_relative|namespace_relative)(\s*,\s*(complain|audit|attach_disconnect|no_attach_disconnected|chroot_attach|chroot_no_attach|chroot_relative|namespace_relative))*\s*\)\s+)/ contained contains=sdFlagKey +syn match sdFlags /\v((flags\s*\=\s*)?\(\s*(complain|audit|attach_disconnected|no_attach_disconnected|chroot_attach|chroot_no_attach|chroot_relative|namespace_relative)(\s*,\s*(complain|audit|attach_disconnected|no_attach_disconnected|chroot_attach|chroot_no_attach|chroot_relative|namespace_relative))*\s*\)\s+)/ contained contains=sdFlagKey syn match sdComment /\s*#.*$/ " NOTE: contains=sdComment changes #include highlighting to comment color. @@ -230,7 +230,7 @@ syn match sdInclude /\s*include\s<\S*>/ " TODO: doesn't check until $ " basic profile block... " \s+ does not work in end=, therefore using \s\s* -syn region Normal start=/\v^(profile\s+)?\S+\s+((flags\s*\=\s*)?\(\s*(complain|audit|attach_disconnect|no_attach_disconnected|chroot_attach|chroot_no_attach|chroot_relative|namespace_relative)(\s*,\s*(complain|audit|attach_disconnect|no_attach_disconnected|chroot_attach|chroot_no_attach|chroot_relative|namespace_relative))*\s*\)\s+)=\{/ matchgroup=sdProfileEnd end=/^}\s*$/ contains=sdProfileName,Hat,@sdEntry,sdComment,sdError,sdInclude -syn region Hat start=/\v^\s+(\^|profile\s+)\S+\s+((flags\s*\=\s*)?\(\s*(complain|audit|attach_disconnect|no_attach_disconnected|chroot_attach|chroot_no_attach|chroot_relative|namespace_relative)(\s*,\s*(complain|audit|attach_disconnect|no_attach_disconnected|chroot_attach|chroot_no_attach|chroot_relative|namespace_relative))*\s*\)\s+)=\{/ matchgroup=sdHatEnd end=/^\s\s*}\s*$/ contains=sdHatName,@sdEntry,sdComment,sdError,sdInclude +syn region Normal start=/\v^(profile\s+)?\S+\s+((flags\s*\=\s*)?\(\s*(complain|audit|attach_disconnected|no_attach_disconnected|chroot_attach|chroot_no_attach|chroot_relative|namespace_relative)(\s*,\s*(complain|audit|attach_disconnected|no_attach_disconnected|chroot_attach|chroot_no_attach|chroot_relative|namespace_relative))*\s*\)\s+)=\{/ matchgroup=sdProfileEnd end=/^}\s*$/ contains=sdProfileName,Hat,@sdEntry,sdComment,sdError,sdInclude +syn region Hat start=/\v^\s+(\^|profile\s+)\S+\s+((flags\s*\=\s*)?\(\s*(complain|audit|attach_disconnected|no_attach_disconnected|chroot_attach|chroot_no_attach|chroot_relative|namespace_relative)(\s*,\s*(complain|audit|attach_disconnected|no_attach_disconnected|chroot_attach|chroot_no_attach|chroot_relative|namespace_relative))*\s*\)\s+)=\{/ matchgroup=sdHatEnd end=/^\s\s*}\s*$/ contains=sdHatName,@sdEntry,sdComment,sdError,sdInclude diff --git a/vim.changes b/vim.changes index c42eaad..ba4f9a2 100644 --- a/vim.changes +++ b/vim.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Feb 26 19:34:27 UTC 2014 - opensuse@cboltz.de + +- Updated apparmor.vim (taken from AppArmor 2.8.3) + * Fixes the attach_disconnected flag + ------------------------------------------------------------------- Tue Feb 25 09:56:21 UTC 2014 - idonmez@suse.com From 9c7c68e48660e48af46667bfc11f610516618f9d09f2b3c4bc84d476c7fe42bb Mon Sep 17 00:00:00 2001 From: Dirk Stoecker Date: Wed, 26 Feb 2014 20:07:14 +0000 Subject: [PATCH 3/6] OBS-URL: https://build.opensuse.org/package/show/editors/vim?expand=0&rev=197 --- vim.changes | 1 + 1 file changed, 1 insertion(+) diff --git a/vim.changes b/vim.changes index ba4f9a2..0953dd5 100644 --- a/vim.changes +++ b/vim.changes @@ -3,6 +3,7 @@ Wed Feb 26 19:34:27 UTC 2014 - opensuse@cboltz.de - Updated apparmor.vim (taken from AppArmor 2.8.3) * Fixes the attach_disconnected flag +- enable xterm_clipboard again, restoring features present in openSuSE 12.3 ------------------------------------------------------------------- Tue Feb 25 09:56:21 UTC 2014 - idonmez@suse.com From 48eed2b92a9720c9e01f46095eea74bbafbdafa73c25d1c89054b3424749f525 Mon Sep 17 00:00:00 2001 From: Dirk Stoecker Date: Wed, 26 Feb 2014 20:08:55 +0000 Subject: [PATCH 4/6] OBS-URL: https://build.opensuse.org/package/show/editors/vim?expand=0&rev=198 --- vim.changes | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/vim.changes b/vim.changes index 0953dd5..d7ecece 100644 --- a/vim.changes +++ b/vim.changes @@ -3,6 +3,10 @@ Wed Feb 26 19:34:27 UTC 2014 - opensuse@cboltz.de - Updated apparmor.vim (taken from AppArmor 2.8.3) * Fixes the attach_disconnected flag + +------------------------------------------------------------------- +Wed Feb 26 19:34:27 UTC 2014 - robin.roth@kit.edu + - enable xterm_clipboard again, restoring features present in openSuSE 12.3 ------------------------------------------------------------------- From 0ff96cb974f56521940cbf057416e8ea890e58496917cc7facd1c220a317e881 Mon Sep 17 00:00:00 2001 From: Dirk Stoecker Date: Wed, 26 Feb 2014 20:11:00 +0000 Subject: [PATCH 5/6] OBS-URL: https://build.opensuse.org/package/show/editors/vim?expand=0&rev=199 --- vim.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vim.changes b/vim.changes index d7ecece..b7a1edf 100644 --- a/vim.changes +++ b/vim.changes @@ -5,7 +5,7 @@ Wed Feb 26 19:34:27 UTC 2014 - opensuse@cboltz.de * Fixes the attach_disconnected flag ------------------------------------------------------------------- -Wed Feb 26 19:34:27 UTC 2014 - robin.roth@kit.edu +Thu Feb 20 16:12:38 UTC 2014 - robin.roth@kit.edu - enable xterm_clipboard again, restoring features present in openSuSE 12.3 From 86038286d4260fd91d21b2b099bfce55516ee1e29a939cda13189d0b939bce3e Mon Sep 17 00:00:00 2001 From: Dirk Stoecker Date: Wed, 26 Feb 2014 20:21:02 +0000 Subject: [PATCH 6/6] OBS-URL: https://build.opensuse.org/package/show/editors/vim?expand=0&rev=200 --- vim.changes | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/vim.changes b/vim.changes index b7a1edf..0201260 100644 --- a/vim.changes +++ b/vim.changes @@ -4,11 +4,6 @@ Wed Feb 26 19:34:27 UTC 2014 - opensuse@cboltz.de - Updated apparmor.vim (taken from AppArmor 2.8.3) * Fixes the attach_disconnected flag -------------------------------------------------------------------- -Thu Feb 20 16:12:38 UTC 2014 - robin.roth@kit.edu - -- enable xterm_clipboard again, restoring features present in openSuSE 12.3 - ------------------------------------------------------------------- Tue Feb 25 09:56:21 UTC 2014 - idonmez@suse.com @@ -29,6 +24,11 @@ Tue Feb 25 09:56:21 UTC 2014 - idonmez@suse.com * Memory leak when giving E853. - Disable test87 until python 3.4 is fixed (http://bugs.python.org/issue20763) +------------------------------------------------------------------- +Thu Feb 20 16:12:38 UTC 2014 - robin.roth@kit.edu + +- enable xterm_clipboard again, restoring features present in openSuSE 12.3 + ------------------------------------------------------------------- Wed Feb 12 09:34:44 UTC 2014 - idonmez@suse.com