Skip to content

C
chromebrew
Commit 03429b14 authored by satmandu's avatar satmandu Committed by GitHub
Browse files
Options

nolibssp vim rebuild (#5642) 

* nolibssp vim rebuild

* Update xxd_standalone.rb

* update hashes

* later vim perlinterp dynamic is broken

* test removing perl from buildessential

* fix compile of vim w/o perl

* revert disabling perl in buildessential

* rebuild with perl rebuild
parent 193490c2
Hide whitespace changes
Inline Side-by-side
Showing with 70 additions and 55 deletions
packages/gvim.rb
View file @ 03429b14
......@@ -3,24 +3,24 @@ require 'package'
class Gvim < Package
description 'Vim is a highly configurable text editor built to make creating and changing any kind of text very efficient. (with advanced features, such as a GUI)'
homepage 'http://www.vim.org/'
@_ver = '8.2.2725'
@_ver = '8.2.2783'
version @_ver
license 'GPL-2'
compatibility 'all'
source_url "https://github.com/vim/vim/archive/refs/tags/v#{@_ver}.tar.gz"
source_sha256 'a8aca906cf63fdc4264f86c1c39f8164989de0be3dc18553cb23bd6226c361a9'
source_url 'https://github.com/vim/vim.git'
git_hashtag "v#{@_ver}"
binary_url({
aarch64: 'https://downloads.sourceforge.net/project/chromebrew/armv7l/gvim-8.2.2725-chromeos-armv7l.tar.xz',
armv7l: 'https://downloads.sourceforge.net/project/chromebrew/armv7l/gvim-8.2.2725-chromeos-armv7l.tar.xz',
i686: 'https://downloads.sourceforge.net/project/chromebrew/i686/gvim-8.2.2725-chromeos-i686.tar.xz',
x86_64: 'https://downloads.sourceforge.net/project/chromebrew/x86_64/gvim-8.2.2725-chromeos-x86_64.tar.xz'
aarch64: 'https://downloads.sourceforge.net/project/chromebrew/armv7l/gvim-8.2.2783-chromeos-armv7l.tar.xz',
armv7l: 'https://downloads.sourceforge.net/project/chromebrew/armv7l/gvim-8.2.2783-chromeos-armv7l.tar.xz',
i686: 'https://downloads.sourceforge.net/project/chromebrew/i686/gvim-8.2.2783-chromeos-i686.tar.xz',
x86_64: 'https://downloads.sourceforge.net/project/chromebrew/x86_64/gvim-8.2.2783-chromeos-x86_64.tar.xz'
})
binary_sha256({
aarch64: '0c813f4f93053af3d50e6bad0de4742eba2a99bed72ca5ca239fdf1b31d42b69',
armv7l: '0c813f4f93053af3d50e6bad0de4742eba2a99bed72ca5ca239fdf1b31d42b69',
i686: '2b9dd78e45e4543874fb5f5237e33edcf8c6ece04b9263c992ca4d9e7200a486',
x86_64: '177d45f4f3dd52e3148d46ab4de6b4ffe9f91b0ead63f9e75d5891a1ce1ff706'
aarch64: 'bb178b2d66d9a84237b4f4dfacd78befa7a5b88baffe0f49f8bacee045dda6bd',
armv7l: 'bb178b2d66d9a84237b4f4dfacd78befa7a5b88baffe0f49f8bacee045dda6bd',
i686: 'a0ad2d39ab72c9d5f827fdb0bdaeb39ca6cd64114f4520f3979f43852dcf9458',
x86_64: '979a27bf60ed3af9e08d61c159d51d39dade3f32818d57e50fd846f9a840935d'
})
depends_on 'vim_runtime'
......@@ -40,11 +40,11 @@ class Gvim < Package
'feature.h'
system 'sed', '-i', "s|^.*#define SYS_GVIMRC_FILE.*$|#define SYS_GVIMRC_FILE \"#{CREW_PREFIX}/etc/gvimrc\"|",
'feature.h'
system 'autoconf'
end
end
def self.build
system '[ -x configure ] || autoreconf -fvi'
system "env CFLAGS='-pipe -fno-stack-protector -U_FORTIFY_SOURCE -flto=auto' \
CXXFLAGS='-pipe -fno-stack-protector -U_FORTIFY_SOURCE -flto=auto' \
LDFLAGS='-fno-stack-protector -U_FORTIFY_SOURCE -flto=auto' \
......@@ -78,6 +78,12 @@ class Gvim < Package
# these are provided by 'vim_runtime'
FileUtils.rm_r "#{CREW_DEST_PREFIX}/share/vim"
# these are provided by 'xxd_standalone'
@deletefiles = %W[#{CREW_DEST_PREFIX}/bin/xxd #{CREW_DEST_MAN_PREFIX}/man1/xxd.1]
@deletefiles.each do |f|
FileUtils.rm f if File.exist?(f)
end
end
def self.postinstall
......
packages/vim.rb
View file @ 03429b14
......@@ -3,24 +3,24 @@ require 'package'
class Vim < Package
description 'Vim is a highly configurable text editor built to make creating and changing any kind of text very efficient.'
homepage 'http://www.vim.org/'
@_ver = '8.2.2725'
@_ver = '8.2.2783'
version @_ver
license 'GPL-2'
compatibility 'all'
source_url "https://github.com/vim/vim/archive/refs/tags/v#{@_ver}.tar.gz"
source_sha256 'a8aca906cf63fdc4264f86c1c39f8164989de0be3dc18553cb23bd6226c361a9'
source_url 'https://github.com/vim/vim.git'
git_hashtag "v#{@_ver}"
binary_url({
aarch64: 'https://downloads.sourceforge.net/project/chromebrew/armv7l/vim-8.2.2725-chromeos-armv7l.tar.xz',
armv7l: 'https://downloads.sourceforge.net/project/chromebrew/armv7l/vim-8.2.2725-chromeos-armv7l.tar.xz',
i686: 'https://downloads.sourceforge.net/project/chromebrew/i686/vim-8.2.2725-chromeos-i686.tar.xz',
x86_64: 'https://downloads.sourceforge.net/project/chromebrew/x86_64/vim-8.2.2725-chromeos-x86_64.tar.xz'
aarch64: 'https://downloads.sourceforge.net/project/chromebrew/armv7l/vim-8.2.2783-chromeos-armv7l.tar.xz',
armv7l: 'https://downloads.sourceforge.net/project/chromebrew/armv7l/vim-8.2.2783-chromeos-armv7l.tar.xz',
i686: 'https://downloads.sourceforge.net/project/chromebrew/i686/vim-8.2.2783-chromeos-i686.tar.xz',
x86_64: 'https://downloads.sourceforge.net/project/chromebrew/x86_64/vim-8.2.2783-chromeos-x86_64.tar.xz'
})
binary_sha256({
aarch64: 'c7c267037313e808abd4106eff6c2ae47e6cd95ccc2c97fd84ba0034efc9a0ed',
armv7l: 'c7c267037313e808abd4106eff6c2ae47e6cd95ccc2c97fd84ba0034efc9a0ed',
i686: '596357e4b5a9b098d6724a26dc120dbc8b3bccf3d7d706caa604a7fc1aa44036',
x86_64: 'a46443dd0cd6b6b8f924cb0f531154c5ac551bddcaa2e9ea52b93d18ae0864fc'
aarch64: '3051888f588842fe3001ab6bd014d28c094cbb45096078295dd82f2640e2557f',
armv7l: '3051888f588842fe3001ab6bd014d28c094cbb45096078295dd82f2640e2557f',
i686: 'e20d87a9a0bfaa0470ef317f51f5786076b0fc15ef55a2b12daf044f731fb5ff',
x86_64: '53c2887e570759765ae43abeedd7857b6fafb531f94aac2dbc48901c85110fbd'
})
depends_on 'vim_runtime'
......@@ -38,11 +38,11 @@ class Vim < Package
'feature.h'
system 'sed', '-i', "s|^.*#define SYS_GVIMRC_FILE.*$|#define SYS_GVIMRC_FILE \"#{CREW_PREFIX}/etc/gvimrc\"|",
'feature.h'
system 'autoconf'
end
end
def self.build
system '[ -x configure ] || autoreconf -fvi'
system "env CFLAGS='-pipe -fno-stack-protector -U_FORTIFY_SOURCE -flto=auto' \
CXXFLAGS='-pipe -fno-stack-protector -U_FORTIFY_SOURCE -flto=auto' \
LDFLAGS='-fno-stack-protector -U_FORTIFY_SOURCE -flto=auto' \
......@@ -77,6 +77,12 @@ class Vim < Package
# these are provided by 'vim_runtime'
FileUtils.rm_r "#{CREW_DEST_PREFIX}/share/vim"
# these are provided by 'xxd_standalone'
@deletefiles = %W[#{CREW_DEST_PREFIX}/bin/xxd #{CREW_DEST_MAN_PREFIX}/man1/xxd.1]
@deletefiles.each do |f|
FileUtils.rm f if File.exist?(f)
end
# remove desktop and icon files for the terminal package
FileUtils.rm_r "#{CREW_DEST_PREFIX}/share/applications"
FileUtils.rm_r "#{CREW_DEST_PREFIX}/share/icons"
......
packages/vim_runtime.rb
View file @ 03429b14
......@@ -3,24 +3,24 @@ require 'package'
class Vim_runtime < Package
description 'Vim is a highly configurable text editor built to make creating and changing any kind of text very efficient. (shared runtime)'
homepage 'http://www.vim.org/'
@_ver = '8.2.2725'
@_ver = '8.2.2783'
version @_ver
license 'GPL-2'
compatibility 'all'
source_url "https://github.com/vim/vim/archive/refs/tags/v#{@_ver}.tar.gz"
source_sha256 'a8aca906cf63fdc4264f86c1c39f8164989de0be3dc18553cb23bd6226c361a9'
source_url 'https://github.com/vim/vim.git'
git_hashtag "v#{@_ver}"
binary_url({
aarch64: 'https://downloads.sourceforge.net/project/chromebrew/armv7l/vim_runtime-8.2.2725-chromeos-armv7l.tar.xz',
armv7l: 'https://downloads.sourceforge.net/project/chromebrew/armv7l/vim_runtime-8.2.2725-chromeos-armv7l.tar.xz',
i686: 'https://downloads.sourceforge.net/project/chromebrew/i686/vim_runtime-8.2.2725-chromeos-i686.tar.xz',
x86_64: 'https://downloads.sourceforge.net/project/chromebrew/x86_64/vim_runtime-8.2.2725-chromeos-x86_64.tar.xz'
aarch64: 'https://downloads.sourceforge.net/project/chromebrew/armv7l/vim_runtime-8.2.2783-chromeos-armv7l.tar.xz',
armv7l: 'https://downloads.sourceforge.net/project/chromebrew/armv7l/vim_runtime-8.2.2783-chromeos-armv7l.tar.xz',
i686: 'https://downloads.sourceforge.net/project/chromebrew/i686/vim_runtime-8.2.2783-chromeos-i686.tar.xz',
x86_64: 'https://downloads.sourceforge.net/project/chromebrew/x86_64/vim_runtime-8.2.2783-chromeos-x86_64.tar.xz'
})
binary_sha256({
aarch64: '25defdc827b9d728a772b030bcb0b70ddef40e0d0cfc0c541e5586134006f84f',
armv7l: '25defdc827b9d728a772b030bcb0b70ddef40e0d0cfc0c541e5586134006f84f',
i686: '9bed968fb77eaf4738a5d9a327fdfd8163be88e710a69f32c11e5d90562cfb2a',
x86_64: 'beeb273511e1728621609d5ab03d115ccab2f2197a90e72de0d39ed391120898'
aarch64: '5ebaa13f220c72794f065f4173a0f669a6334ee36cce70f70ac191fcd218ff1a',
armv7l: '5ebaa13f220c72794f065f4173a0f669a6334ee36cce70f70ac191fcd218ff1a',
i686: 'fe0bed8bc2aaa80db2748876c746cfce7f6c1004a30f3293f9497bdbdf6ca04e',
x86_64: 'f1e37f9c9ad6cf1fea25581634abc0a67ec51f4c64bfc0936b9a9544a958095b'
})
depends_on 'gpm'
......@@ -33,11 +33,11 @@ class Vim_runtime < Package
'feature.h'
system 'sed', '-i', "s|^.*#define SYS_GVIMRC_FILE.*$|#define SYS_GVIMRC_FILE \"#{CREW_PREFIX}/etc/gvimrc\"|",
'feature.h'
system 'autoconf'
end
end
def self.build
system '[ -x configure ] || autoreconf -fvi'
system "env CFLAGS='-pipe -fno-stack-protector -U_FORTIFY_SOURCE -flto=auto' \
CXXFLAGS='-pipe -fno-stack-protector -U_FORTIFY_SOURCE -flto=auto' \
LDFLAGS='-fno-stack-protector -U_FORTIFY_SOURCE -flto=auto' \
......@@ -76,6 +76,12 @@ class Vim_runtime < Package
FileUtils.rm_r "#{CREW_DEST_PREFIX}/share/applications"
FileUtils.rm_r "#{CREW_DEST_PREFIX}/share/icons"
# these are provided by 'xxd_standalone'
@deletefiles = %W[#{CREW_DEST_PREFIX}/bin/xxd #{CREW_DEST_MAN_PREFIX}/man1/xxd.1]
@deletefiles.each do |f|
FileUtils.rm f if File.exist?(f)
end
# add sane defaults and simulate some XDG support
FileUtils.mkdir_p("#{CREW_DEST_PREFIX}/share/vim/vimfiles")
File.write("#{CREW_DEST_PREFIX}/share/vim/vimfiles/chromebrew.vim", <<~EOF)
......@@ -121,20 +127,17 @@ class Vim_runtime < Package
silent! call mkdir(expand(&g:undodir), 'p', 0700)
endif
EOF
end
def self.postinstall
vimrc = "#{CREW_PREFIX}/etc/vimrc"
# keep user changes by writing to a new file
vimrc += '.new' if File.exist?(vimrc)
system "sed -i 's/set mouse=a/set mouse-=a/g' #{CREW_DEST_PREFIX}/share/vim/vim82/defaults.vim"
FileUtils.mkdir_p "#{CREW_DEST_PREFIX}/etc"
vimrc = "#{CREW_DEST_PREFIX}/etc/vimrc"
# by default we will load the global config
File.write(vimrc, <<~EOF)
File.write(vimrc, <<~VIMRCEOF)
" System-wide defaults are in #{CREW_PREFIX}/share/vim/vimfiles/chromebrew.vim
" and sourced by this file. If you wish to change any of those settings, you
" should do so at the end of this file or in your user-specific (~/.vimrc) file.
" If you do not wish to use the bundled defaults, remove the next line.
runtime! chromebrew.vim
EOF
VIMRCEOF
end
end
packages/xxd_standalone.rb
View file @ 03429b14
......@@ -3,24 +3,24 @@ require 'package'
class Xxd_standalone < Package
description 'Hexdump utility from vim'
homepage 'http://www.vim.org'
@_ver = '8.2.2725'
@_ver = '8.2.2771'
version @_ver
license 'GPL-2'
compatibility 'all'
source_url "https://github.com/vim/vim/archive/refs/tags/v#{@_ver}.tar.gz"
source_sha256 'a8aca906cf63fdc4264f86c1c39f8164989de0be3dc18553cb23bd6226c361a9'
source_url 'https://github.com/vim/vim.git'
git_hashtag "v#{@_ver}"
binary_url({
aarch64: 'https://downloads.sourceforge.net/project/chromebrew/armv7l/xxd_standalone-8.2.2725-chromeos-armv7l.tar.xz',
armv7l: 'https://downloads.sourceforge.net/project/chromebrew/armv7l/xxd_standalone-8.2.2725-chromeos-armv7l.tar.xz',
i686: 'https://downloads.sourceforge.net/project/chromebrew/i686/xxd_standalone-8.2.2725-chromeos-i686.tar.xz',
x86_64: 'https://downloads.sourceforge.net/project/chromebrew/x86_64/xxd_standalone-8.2.2725-chromeos-x86_64.tar.xz'
aarch64: 'https://downloads.sourceforge.net/project/chromebrew/armv7l/xxd_standalone-8.2.2771-chromeos-armv7l.tar.xz',
armv7l: 'https://downloads.sourceforge.net/project/chromebrew/armv7l/xxd_standalone-8.2.2771-chromeos-armv7l.tar.xz',
i686: 'https://downloads.sourceforge.net/project/chromebrew/i686/xxd_standalone-8.2.2771-chromeos-i686.tar.xz',
x86_64: 'https://downloads.sourceforge.net/project/chromebrew/x86_64/xxd_standalone-8.2.2771-chromeos-x86_64.tar.xz'
})
binary_sha256({
aarch64: '2dfdca9a6df73cfcd2d668bde027cf612dac84903d431317dc80ba436e7d6043',
armv7l: '2dfdca9a6df73cfcd2d668bde027cf612dac84903d431317dc80ba436e7d6043',
i686: '06af0aab3534058d294e616a41cfe29221e615c9a381d144a82b00379e4dea4d',
x86_64: '91756fb4d218b84362163da540500ccf10e2e2782a264a86584d5dd6e87a2b25'
aarch64: 'f271aa2395a61e7e5dc8c663635dc33c773489df0a6491e75d402638ec9b03d8',
armv7l: 'f271aa2395a61e7e5dc8c663635dc33c773489df0a6491e75d402638ec9b03d8',
i686: 'f51c5c9f5cc775f6d312a12a90dd08f35a55332fac1a67cb22180c1c655e6b0d',
x86_64: '4a765d6217a05f24c124a8fde1d35ae56d636021371a66337d93ce3680f1ab92'
})
def self.build
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7