Merge branch 'staging'
10k staging builds are not yet finished on Hydra (mostly darwin), but we now have a 20k jobs rebuilding directly on master, so we would never get to merge this way...
This commit is contained in:
commit
422adc3063
|
@ -24,7 +24,7 @@ let
|
|||
|
||||
for file in $out/bin/*; do
|
||||
chmod +w $file
|
||||
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
|
||||
patchelf --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \
|
||||
--set-rpath ${lib.makeLibraryPath [ pkgs.stdenv.cc.cc ]} \
|
||||
$file
|
||||
done
|
||||
|
|
|
@ -10,11 +10,11 @@ let
|
|||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "inkscape-0.92.1";
|
||||
name = "inkscape-0.92.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://media.inkscape.org/dl/resources/file/${name}.tar_XlpI7qT.bz2";
|
||||
sha256 = "01chr3vh728dkg7l7lilwgmh5nrp784khdhjgpqjbq9dh2zhax15";
|
||||
url = "https://media.inkscape.org/dl/resources/file/${name}.tar.bz2";
|
||||
sha256 = "1lyghk6yarcv9nwkh6k366p6hb7rfilqcvbyji09hki59khd0a56";
|
||||
};
|
||||
|
||||
unpackPhase = ''
|
||||
|
@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
meta = with stdenv.lib; {
|
||||
license = "GPL";
|
||||
homepage = http://www.inkscape.org;
|
||||
homepage = https://www.inkscape.org;
|
||||
description = "Vector graphics editor";
|
||||
platforms = platforms.all;
|
||||
longDescription = ''
|
||||
|
|
|
@ -0,0 +1,108 @@
|
|||
#! @shell@
|
||||
|
||||
set -eu -o pipefail
|
||||
|
||||
path_backup="$PATH"
|
||||
if [ -n "@coreutils_bin@" ]; then
|
||||
PATH="@coreutils_bin@/bin"
|
||||
fi
|
||||
|
||||
declare -r recurThreshold=300
|
||||
|
||||
declare overflowCount=0
|
||||
for ((n=0; n < $#; ++n)); do
|
||||
case "${!n}" in
|
||||
-l*) let overflowCount+=1 ;;
|
||||
-reexport-l*) let overflowCount+=1 ;;
|
||||
*) ;;
|
||||
esac
|
||||
done
|
||||
|
||||
declare -a allArgs=()
|
||||
|
||||
if (( "$overflowCount" <= "$recurThreshold" )); then
|
||||
allArgs=("$@")
|
||||
else
|
||||
declare -a childrenLookup=() childrenLink=()
|
||||
|
||||
while (( $# )); do
|
||||
case "$1" in
|
||||
-L/*)
|
||||
childrenLookup+=("$1")
|
||||
allArgs+=("$1")
|
||||
;;
|
||||
-L)
|
||||
echo "cctools LD does not support '-L foo' or '-l foo'" >&2
|
||||
exit 1
|
||||
;;
|
||||
-l)
|
||||
echo "cctools LD does not support '-L foo' or '-l foo'" >&2
|
||||
exit 1
|
||||
;;
|
||||
-lazy_library | -lazy_framework | -lto_library)
|
||||
# We aren't linking any "azy_library", "to_library", etc.
|
||||
allArgs+=("$1")
|
||||
;;
|
||||
-lazy-l | -weak-l) allArgs+=("$1") ;;
|
||||
# We can't so easily prevent header issues from these.
|
||||
-lSystem) allArgs+=("$1") ;;
|
||||
# Special case as indirection seems like a bad idea for something
|
||||
# so fundamental. Can be removed for simplicity.
|
||||
-l?* | -reexport-l?*) childrenLink+=("$1") ;;
|
||||
*) allArgs+=("$1") ;;
|
||||
esac
|
||||
|
||||
shift
|
||||
done
|
||||
|
||||
declare n=0
|
||||
while (( $n < "${#childrenLink[@]}" )); do
|
||||
if [[ "${childrenLink[n]}" = -l* ]]; then
|
||||
childrenLink[n]="-reexport${childrenLink[n]}"
|
||||
fi
|
||||
let ++n
|
||||
done
|
||||
unset n
|
||||
|
||||
declare -r outputNameLibless=$(basename $( \
|
||||
if [[ -z "${outputName:+isUndefined}" ]]; then
|
||||
echo unnamed
|
||||
elif [[ "${outputName:0:3}" = lib ]]; then
|
||||
echo "${outputName:3}"
|
||||
else
|
||||
echo "${outputName}"
|
||||
fi))
|
||||
declare -ra children=("$outputNameLibless-reexport-delegate-0" \
|
||||
"$outputNameLibless-reexport-delegate-1")
|
||||
|
||||
mkdir -p "$out/lib"
|
||||
|
||||
PATH="$PATH:@out@/bin"
|
||||
|
||||
symbolBloatObject=$outputNameLibless-symbol-hack.o
|
||||
if [[ ! -e $symbolBloatObject ]]; then
|
||||
# `-Q` means use GNU Assembler rather than Clang, avoiding an awkward
|
||||
# dependency cycle.
|
||||
printf '.private_extern _______child_hack_foo\nchild_hack_foo:\n' \
|
||||
| @binPrefix@as -Q -- -o $symbolBloatObject
|
||||
fi
|
||||
|
||||
# first half of libs
|
||||
@binPrefix@ld -macosx_version_min $MACOSX_DEPLOYMENT_TARGET -arch x86_64 -dylib \
|
||||
-o "$out/lib/lib${children[0]}.dylib" \
|
||||
-install_name "$out/lib/lib${children[0]}.dylib" \
|
||||
"${childrenLookup[@]}" "$symbolBloatObject" \
|
||||
"${childrenLink[@]:0:$((${#childrenLink[@]} / 2 ))}"
|
||||
|
||||
# second half of libs
|
||||
@binPrefix@ld -macosx_version_min $MACOSX_DEPLOYMENT_TARGET -arch x86_64 -dylib \
|
||||
-o "$out/lib/lib${children[1]}.dylib" \
|
||||
-install_name "$out/lib/lib${children[1]}.dylib" \
|
||||
"${childrenLookup[@]}" "$symbolBloatObject" \
|
||||
"${childrenLink[@]:$((${#childrenLink[@]} / 2 ))}"
|
||||
|
||||
allArgs+=("-L$out/lib" "-l${children[0]}" "-l${children[1]}")
|
||||
fi
|
||||
|
||||
PATH="$path_backup"
|
||||
exec @prog@ "${allArgs[@]}"
|
|
@ -5,11 +5,6 @@
|
|||
# wrapped binary just inherit the work of the forker's wrapper script.
|
||||
|
||||
var_templates=(
|
||||
NIX_CC_WRAPPER+START_HOOK
|
||||
NIX_CC_WRAPPER+EXEC_HOOK
|
||||
NIX_LD_WRAPPER+START_HOOK
|
||||
NIX_LD_WRAPPER+EXEC_HOOK
|
||||
|
||||
NIX+CFLAGS_COMPILE
|
||||
NIX+CFLAGS_LINK
|
||||
NIX+CXXSTDLIB_COMPILE
|
||||
|
@ -19,7 +14,6 @@ var_templates=(
|
|||
NIX+LDFLAGS
|
||||
NIX+LDFLAGS_BEFORE
|
||||
NIX+LDFLAGS_AFTER
|
||||
NIX+LDFLAGS_HARDEN
|
||||
|
||||
NIX+SET_BUILD_ID
|
||||
NIX+DONT_SET_RPATH
|
||||
|
|
|
@ -43,6 +43,7 @@ if [[ -z "${hardeningDisableMap[all]:-}" ]]; then
|
|||
hardeningCFlags+=('-fPIE')
|
||||
if [[ ! ("$*" =~ " -shared " || "$*" =~ " -static ") ]]; then
|
||||
if [[ -n "${NIX_DEBUG:-}" ]]; then echo HARDENING: enabling LDFlags -pie >&2; fi
|
||||
hardeningCFlags+=('-pie')
|
||||
hardeningLDFlags+=('-pie')
|
||||
fi
|
||||
;;
|
||||
|
@ -67,7 +68,8 @@ if [[ -z "${hardeningDisableMap[all]:-}" ]]; then
|
|||
hardeningLDFlags+=('-z' 'now')
|
||||
;;
|
||||
*)
|
||||
echo "Hardening flag unknown: $flag" >&2
|
||||
# Ignore unsupported. Checked in Nix that at least *some*
|
||||
# tool supports each flag.
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
|
|
|
@ -15,10 +15,6 @@ if [ -z "${NIX_CC_WRAPPER_@infixSalt@_FLAGS_SET:-}" ]; then
|
|||
source @out@/nix-support/add-flags.sh
|
||||
fi
|
||||
|
||||
if [ -n "$NIX_CC_WRAPPER_@infixSalt@_START_HOOK" ]; then
|
||||
source "$NIX_CC_WRAPPER_@infixSalt@_START_HOOK"
|
||||
fi
|
||||
|
||||
source @out@/nix-support/utils.sh
|
||||
|
||||
|
||||
|
@ -138,7 +134,7 @@ if [ "$dontLink" != 1 ]; then
|
|||
|
||||
# Add the flags that should only be passed to the compiler when
|
||||
# linking.
|
||||
extraAfter+=($NIX_@infixSalt@_CFLAGS_LINK "${hardeningLDFlags[@]}")
|
||||
extraAfter+=($NIX_@infixSalt@_CFLAGS_LINK)
|
||||
|
||||
# Add the flags that should be passed to the linker (and prevent
|
||||
# `ld-wrapper' from adding NIX_@infixSalt@_LDFLAGS again).
|
||||
|
@ -175,10 +171,6 @@ if [ -n "${NIX_DEBUG:-}" ]; then
|
|||
printf " %q\n" ${extraAfter+"${extraAfter[@]}"} >&2
|
||||
fi
|
||||
|
||||
if [ -n "$NIX_CC_WRAPPER_@infixSalt@_EXEC_HOOK" ]; then
|
||||
source "$NIX_CC_WRAPPER_@infixSalt@_EXEC_HOOK"
|
||||
fi
|
||||
|
||||
PATH="$path_backup"
|
||||
# Old bash workaround, see above.
|
||||
exec @prog@ \
|
||||
|
|
|
@ -17,10 +17,6 @@ if [ -z "${NIX_@infixSalt@_GNAT_WRAPPER_FLAGS_SET:-}" ]; then
|
|||
source @out@/nix-support/add-flags.sh
|
||||
fi
|
||||
|
||||
if [ -n "$NIX_@infixSalt@_GNAT_WRAPPER_START_HOOK" ]; then
|
||||
source "$NIX_@infixSalt@_GNAT_WRAPPER_START_HOOK"
|
||||
fi
|
||||
|
||||
source @out@/nix-support/utils.sh
|
||||
|
||||
|
||||
|
@ -122,9 +118,5 @@ if [ -n "${NIX_DEBUG:-}" ]; then
|
|||
printf " %q\n" "${extraAfter[@]}" >&2
|
||||
fi
|
||||
|
||||
if [ -n "$NIX_@infixSalt@_GNAT_WRAPPER_EXEC_HOOK" ]; then
|
||||
source "$NIX_@infixSalt@_GNAT_WRAPPER_EXEC_HOOK"
|
||||
fi
|
||||
|
||||
PATH="$path_backup"
|
||||
exec @prog@ "${extraBefore[@]}" "${params[@]}" "${extraAfter[@]}"
|
||||
|
|
|
@ -33,8 +33,4 @@ if [ -n "${NIX_DEBUG:-}" ]; then
|
|||
printf " %q\n" "${extraAfter[@]}" >&2
|
||||
fi
|
||||
|
||||
if [ -n "$NIX_@infixSalt@_GNAT_WRAPPER_EXEC_HOOK" ]; then
|
||||
source "$NIX_@infixSalt@_GNAT_WRAPPER_EXEC_HOOK"
|
||||
fi
|
||||
|
||||
exec @prog@ "${extraBefore[@]}" "$@" "${extraAfter[@]}"
|
||||
|
|
|
@ -14,10 +14,6 @@ if [ -z "${NIX_CC_WRAPPER_@infixSalt@_FLAGS_SET:-}" ]; then
|
|||
source @out@/nix-support/add-flags.sh
|
||||
fi
|
||||
|
||||
if [ -n "$NIX_LD_WRAPPER_@infixSalt@_START_HOOK" ]; then
|
||||
source "$NIX_LD_WRAPPER_@infixSalt@_START_HOOK"
|
||||
fi
|
||||
|
||||
source @out@/nix-support/utils.sh
|
||||
|
||||
|
||||
|
@ -65,7 +61,7 @@ if [ -z "${NIX_@infixSalt@_LDFLAGS_SET:-}" ]; then
|
|||
extraBefore+=($NIX_@infixSalt@_LDFLAGS_BEFORE)
|
||||
fi
|
||||
|
||||
extraAfter+=($NIX_@infixSalt@_LDFLAGS_AFTER $NIX_@infixSalt@_LDFLAGS_HARDEN)
|
||||
extraAfter+=($NIX_@infixSalt@_LDFLAGS_AFTER)
|
||||
|
||||
declare -a libDirs
|
||||
declare -A libs
|
||||
|
@ -145,6 +141,10 @@ if [ "$NIX_@infixSalt@_DONT_SET_RPATH" != 1 ]; then
|
|||
fi
|
||||
done
|
||||
done
|
||||
|
||||
if [ -n "${NIX_COREFOUNDATION_RPATH:-}" ]; then
|
||||
extraAfter+=(-rpath $NIX_COREFOUNDATION_RPATH)
|
||||
fi
|
||||
fi
|
||||
|
||||
|
||||
|
@ -166,10 +166,6 @@ if [ -n "${NIX_DEBUG:-}" ]; then
|
|||
printf " %q\n" ${extraAfter+"${extraAfter[@]}"} >&2
|
||||
fi
|
||||
|
||||
if [ -n "$NIX_LD_WRAPPER_@infixSalt@_EXEC_HOOK" ]; then
|
||||
source "$NIX_LD_WRAPPER_@infixSalt@_EXEC_HOOK"
|
||||
fi
|
||||
|
||||
PATH="$path_backup"
|
||||
# Old bash workaround, see above.
|
||||
exec @prog@ \
|
||||
|
|
|
@ -4,8 +4,8 @@ updateSourceDateEpoch() {
|
|||
# Get the last modification time of all regular files, sort them,
|
||||
# and get the most recent. Maybe we should use
|
||||
# https://github.com/0-wiz-0/findnewest here.
|
||||
local -a res=($(find "$path" -type f -print0 | xargs -0 -r stat -c '%Y %n' | sort -n | tail -n1))
|
||||
local time="${res[0]}"
|
||||
local -a res=($(find "$path" -type f -not -newer "$NIX_BUILD_TOP/.." -printf '%T@ %p\0' | sort -n --zero-terminated | tail -n1 --zero-terminated))
|
||||
local time="${res[0]//\.[0-9]*/}" # remove the fraction part
|
||||
local newestFile="${res[1]}"
|
||||
|
||||
# Update $SOURCE_DATE_EPOCH if the most recent file we found is newer.
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
{ stdenv, intltool, fetchurl, pkgconfig, udisks2, libsecret, libdvdread
|
||||
, bash, gtk3, glib, makeWrapper, cracklib, libnotify
|
||||
, itstool, gnome3, librsvg, gdk_pixbuf, libxml2, python
|
||||
, bash, gtk3, glib, wrapGAppsHook, cracklib, libnotify
|
||||
, itstool, gnome3, gdk_pixbuf, libxml2, python
|
||||
, libcanberra_gtk3, libxslt, libtool, docbook_xsl, libpwquality }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
@ -16,14 +16,8 @@ stdenv.mkDerivation rec {
|
|||
libxslt libtool libsecret libpwquality cracklib
|
||||
libnotify libdvdread libcanberra_gtk3 docbook_xsl
|
||||
gdk_pixbuf gnome3.defaultIconTheme
|
||||
librsvg udisks2 gnome3.gnome_settings_daemon
|
||||
gnome3.gsettings_desktop_schemas makeWrapper libxml2 ];
|
||||
|
||||
preFixup = ''
|
||||
wrapProgram "$out/bin/gnome-disks" \
|
||||
--set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
|
||||
--prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
|
||||
'';
|
||||
udisks2 gnome3.gnome_settings_daemon
|
||||
gnome3.gsettings_desktop_schemas wrapGAppsHook libxml2 ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = https://en.wikipedia.org/wiki/GNOME_Disks;
|
||||
|
|
|
@ -65,7 +65,7 @@ let version = "4.5.4";
|
|||
|
||||
/* Cross-gcc settings */
|
||||
gccArch = stdenv.lib.attrByPath [ "gcc" "arch" ] null targetPlatform;
|
||||
gccCpu = stdenv.lib.attrByPath [ "gcc" "cpu" ] null targetPlatformt;
|
||||
gccCpu = stdenv.lib.attrByPath [ "gcc" "cpu" ] null targetPlatform;
|
||||
gccAbi = stdenv.lib.attrByPath [ "gcc" "abi" ] null targetPlatform;
|
||||
withArch = if gccArch != null then " --with-arch=${gccArch}" else "";
|
||||
withCpu = if gccCpu != null then " --with-cpu=${gccCpu}" else "";
|
||||
|
|
|
@ -2,17 +2,17 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "nasm-${version}";
|
||||
version = "2.12.02";
|
||||
version = "2.13.01";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.nasm.us/pub/nasm/releasebuilds/${version}/${name}.tar.bz2";
|
||||
sha256 = "097318bjxvmffbjfd1k89parc04xf5jfxg2rr93581lccwf8kc00";
|
||||
sha256 = "1ylqs4sqh0paia970v6hpdgq5icxns9zlg21qql232bz1apppy88";
|
||||
};
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = http://www.nasm.us/;
|
||||
description = "An 80x86 and x86-64 assembler designed for portability and modularity";
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ pSub ];
|
||||
maintainers = with maintainers; [ pSub willibutz ];
|
||||
};
|
||||
}
|
||||
|
|
|
@ -83,7 +83,7 @@ let
|
|||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
hardeningDisable = lib.optional isRuby20 [ "format" ];
|
||||
hardeningDisable = lib.optional isRuby20 "format";
|
||||
|
||||
patches =
|
||||
(import ./patchsets.nix {
|
||||
|
|
|
@ -45,7 +45,9 @@ stdenv.mkDerivation rec {
|
|||
fi
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ xz xz.bin ] ++ stdenv.lib.optional (!stdenv.isLinux && !hostPlatform.isCygwin) libiconv; # HACK, see #10874 (and 14664)
|
||||
nativeBuildInputs = [ xz xz.bin ];
|
||||
# HACK, see #10874 (and 14664)
|
||||
buildInputs = stdenv.lib.optional (!stdenv.isLinux && !hostPlatform.isCygwin) libiconv;
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
|
|
|
@ -13,9 +13,8 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "01zki46dr5khzlyywr3cg615bcal32dazfazkf360s1znqh17i4r";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ x11 libXmu libXi ];
|
||||
propagatedNativeBuildInputs = [ mesa_glu ]; # GL/glew.h includes GL/glu.h
|
||||
buildInputs = [] ++ optionals stdenv.isDarwin [ AGL ];
|
||||
buildInputs = [ x11 libXmu libXi ] ++ optionals stdenv.isDarwin [ AGL ];
|
||||
propagatedBuildInputs = [ mesa_glu ]; # GL/glew.h includes GL/glu.h
|
||||
|
||||
patchPhase = ''
|
||||
sed -i 's|lib64|lib|' config/Makefile.linux
|
||||
|
|
|
@ -14,8 +14,8 @@ stdenv.mkDerivation rec {
|
|||
|
||||
outputs = [ "bin" "out" "dev" "doc" ];
|
||||
|
||||
nativeBuildInputs = [ xlibsWrapper libXmu libXi ];
|
||||
propagatedNativeBuildInputs = [ mesa_glu ]; # GL/glew.h includes GL/glu.h
|
||||
buildInputs = [ xlibsWrapper libXmu libXi ];
|
||||
propagatedBuildInputs = [ mesa_glu ]; # GL/glew.h includes GL/glu.h
|
||||
|
||||
patchPhase = ''
|
||||
sed -i 's|lib64|lib|' config/Makefile.linux
|
||||
|
|
BIN
pkgs/development/libraries/glibc/2.25-49.patch.gz
Normal file
BIN
pkgs/development/libraries/glibc/2.25-49.patch.gz
Normal file
Binary file not shown.
|
@ -1,209 +0,0 @@
|
|||
From ba67ba3275d47e0080f0e5f09d9f5102c000c97e Mon Sep 17 00:00:00 2001
|
||||
Message-Id: <ba67ba3275d47e0080f0e5f09d9f5102c000c97e.1495998948.git.fweimer@redhat.com>
|
||||
In-Reply-To: <cover.1495998948.git.fweimer@redhat.com>
|
||||
References: <cover.1495998948.git.fweimer@redhat.com>
|
||||
From: Florian Weimer <fweimer@redhat.com>
|
||||
Date: Sun, 28 May 2017 20:44:52 +0200
|
||||
Subject: [PATCH 3/3] rtld: Reject overly long LD_AUDIT path elements
|
||||
To: libc-alpha@sourceware.org
|
||||
|
||||
Also only process the last LD_AUDIT entry.
|
||||
---
|
||||
elf/rtld.c | 110 ++++++++++++++++++++++++++++++++++++++++++++++++++++---------
|
||||
1 file changed, 95 insertions(+), 15 deletions(-)
|
||||
|
||||
diff --git a/elf/rtld.c b/elf/rtld.c
|
||||
index 30f0cae..89d8573 100644
|
||||
--- a/elf/rtld.c
|
||||
+++ b/elf/rtld.c
|
||||
@@ -116,13 +116,95 @@ dso_name_valid_for_suid (const char *p)
|
||||
return *p != '\0';
|
||||
}
|
||||
|
||||
-/* List of auditing DSOs. */
|
||||
+/* LD_AUDIT variable contents. Must be processed before the
|
||||
+ audit_list below. */
|
||||
+const char *audit_list_string;
|
||||
+
|
||||
+/* Cyclic list of auditing DSOs. audit_list->next is the first
|
||||
+ element. */
|
||||
static struct audit_list
|
||||
{
|
||||
const char *name;
|
||||
struct audit_list *next;
|
||||
} *audit_list;
|
||||
|
||||
+/* Iterator for audit_list_string followed by audit_list. */
|
||||
+struct audit_list_iter
|
||||
+{
|
||||
+ /* Tail of audit_list_string still needing processing, or NULL. */
|
||||
+ const char *audit_list_tail;
|
||||
+
|
||||
+ /* The list element returned in the previous iteration. NULL before
|
||||
+ the first element. */
|
||||
+ struct audit_list *previous;
|
||||
+
|
||||
+ /* Scratch buffer for returning a name which is part of
|
||||
+ audit_list_string. */
|
||||
+#ifdef PATH_MAX
|
||||
+ char fname[PATH_MAX];
|
||||
+#else
|
||||
+ char fname[4096];
|
||||
+#endif
|
||||
+};
|
||||
+
|
||||
+/* Initialize an audit list iterator. */
|
||||
+static void
|
||||
+audit_list_iter_init (struct audit_list_iter *iter)
|
||||
+{
|
||||
+ iter->audit_list_tail = audit_list_string;
|
||||
+ iter->previous = NULL;
|
||||
+}
|
||||
+
|
||||
+/* Iterate through both audit_list_string and audit_list. */
|
||||
+static const char *
|
||||
+audit_list_iter_next (struct audit_list_iter *iter)
|
||||
+{
|
||||
+ if (iter->audit_list_tail != NULL)
|
||||
+ {
|
||||
+ /* First iterate over audit_list_string. */
|
||||
+ while (*iter->audit_list_tail != '\0')
|
||||
+ {
|
||||
+ /* Split audit list at colon. */
|
||||
+ size_t len = strcspn (iter->audit_list_tail, ":");
|
||||
+ if (len > 0 && len < sizeof(iter->fname))
|
||||
+ {
|
||||
+ memcpy (iter->fname, iter->audit_list_tail, len);
|
||||
+ iter->fname[len] = '\0';
|
||||
+ }
|
||||
+ else
|
||||
+ /* Do not return this name to the caller. */
|
||||
+ iter->fname[0] = '\0';
|
||||
+
|
||||
+ /* Skip over the substring and the following delimiter. */
|
||||
+ iter->audit_list_tail += len;
|
||||
+ if (*iter->audit_list_tail == ':')
|
||||
+ ++iter->audit_list_tail;
|
||||
+
|
||||
+ /* If the name is valid, return it. */
|
||||
+ if (dso_name_valid_for_suid (iter->fname))
|
||||
+ return iter->fname;
|
||||
+ /* Otherwise, wrap around and try the next name. */
|
||||
+ }
|
||||
+ /* Fall through to the procesing of audit_list. */
|
||||
+ }
|
||||
+
|
||||
+ if (iter->previous == NULL)
|
||||
+ {
|
||||
+ if (audit_list == NULL)
|
||||
+ /* No pre-parsed audit list. */
|
||||
+ return NULL;
|
||||
+ /* Start of audit list. The first list element is at
|
||||
+ audit_list->next (cyclic list). */
|
||||
+ iter->previous = audit_list->next;
|
||||
+ return iter->previous->name;
|
||||
+ }
|
||||
+ if (iter->previous == audit_list)
|
||||
+ /* Cyclic list wrap-around. */
|
||||
+ return NULL;
|
||||
+ iter->previous = iter->previous->next;
|
||||
+ return iter->previous->name;
|
||||
+}
|
||||
+
|
||||
#ifndef HAVE_INLINED_SYSCALLS
|
||||
/* Set nonzero during loading and initialization of executable and
|
||||
libraries, cleared before the executable's entry point runs. This
|
||||
@@ -1290,11 +1368,13 @@ of this helper program; chances are you did not intend to run this program.\n\
|
||||
GL(dl_rtld_map).l_tls_modid = _dl_next_tls_modid ();
|
||||
|
||||
/* If we have auditing DSOs to load, do it now. */
|
||||
- if (__glibc_unlikely (audit_list != NULL))
|
||||
+ bool need_security_init = true;
|
||||
+ if (__glibc_unlikely (audit_list != NULL)
|
||||
+ || __glibc_unlikely (audit_list_string != NULL))
|
||||
{
|
||||
- /* Iterate over all entries in the list. The order is important. */
|
||||
struct audit_ifaces *last_audit = NULL;
|
||||
- struct audit_list *al = audit_list->next;
|
||||
+ struct audit_list_iter al_iter;
|
||||
+ audit_list_iter_init (&al_iter);
|
||||
|
||||
/* Since we start using the auditing DSOs right away we need to
|
||||
initialize the data structures now. */
|
||||
@@ -1305,9 +1385,14 @@ of this helper program; chances are you did not intend to run this program.\n\
|
||||
use different values (especially the pointer guard) and will
|
||||
fail later on. */
|
||||
security_init ();
|
||||
+ need_security_init = false;
|
||||
|
||||
- do
|
||||
+ while (true)
|
||||
{
|
||||
+ const char *name = audit_list_iter_next (&al_iter);
|
||||
+ if (name == NULL)
|
||||
+ break;
|
||||
+
|
||||
int tls_idx = GL(dl_tls_max_dtv_idx);
|
||||
|
||||
/* Now it is time to determine the layout of the static TLS
|
||||
@@ -1316,7 +1401,7 @@ of this helper program; chances are you did not intend to run this program.\n\
|
||||
no DF_STATIC_TLS bit is set. The reason is that we know
|
||||
glibc will use the static model. */
|
||||
struct dlmopen_args dlmargs;
|
||||
- dlmargs.fname = al->name;
|
||||
+ dlmargs.fname = name;
|
||||
dlmargs.map = NULL;
|
||||
|
||||
const char *objname;
|
||||
@@ -1329,7 +1414,7 @@ of this helper program; chances are you did not intend to run this program.\n\
|
||||
not_loaded:
|
||||
_dl_error_printf ("\
|
||||
ERROR: ld.so: object '%s' cannot be loaded as audit interface: %s; ignored.\n",
|
||||
- al->name, err_str);
|
||||
+ name, err_str);
|
||||
if (malloced)
|
||||
free ((char *) err_str);
|
||||
}
|
||||
@@ -1433,10 +1518,7 @@ ERROR: ld.so: object '%s' cannot be loaded as audit interface: %s; ignored.\n",
|
||||
goto not_loaded;
|
||||
}
|
||||
}
|
||||
-
|
||||
- al = al->next;
|
||||
}
|
||||
- while (al != audit_list->next);
|
||||
|
||||
/* If we have any auditing modules, announce that we already
|
||||
have two objects loaded. */
|
||||
@@ -1700,7 +1782,7 @@ ERROR: ld.so: object '%s' cannot be loaded as audit interface: %s; ignored.\n",
|
||||
if (tcbp == NULL)
|
||||
tcbp = init_tls ();
|
||||
|
||||
- if (__glibc_likely (audit_list == NULL))
|
||||
+ if (__glibc_likely (need_security_init))
|
||||
/* Initialize security features. But only if we have not done it
|
||||
earlier. */
|
||||
security_init ();
|
||||
@@ -2331,9 +2413,7 @@ process_dl_audit (char *str)
|
||||
char *p;
|
||||
|
||||
while ((p = (strsep) (&str, ":")) != NULL)
|
||||
- if (p[0] != '\0'
|
||||
- && (__builtin_expect (! __libc_enable_secure, 1)
|
||||
- || strchr (p, '/') == NULL))
|
||||
+ if (dso_name_valid_for_suid (p))
|
||||
{
|
||||
/* This is using the local malloc, not the system malloc. The
|
||||
memory can never be freed. */
|
||||
@@ -2397,7 +2477,7 @@ process_envvars (enum mode *modep)
|
||||
break;
|
||||
}
|
||||
if (memcmp (envline, "AUDIT", 5) == 0)
|
||||
- process_dl_audit (&envline[6]);
|
||||
+ audit_list_string = &envline[6];
|
||||
break;
|
||||
|
||||
case 7:
|
||||
--
|
||||
2.9.4
|
||||
|
|
@ -1,33 +0,0 @@
|
|||
From 4d009d39ac9ede0369e268554a181b428f177a80 Mon Sep 17 00:00:00 2001
|
||||
Message-Id: <4d009d39ac9ede0369e268554a181b428f177a80.1495998948.git.fweimer@redhat.com>
|
||||
In-Reply-To: <cover.1495998948.git.fweimer@redhat.com>
|
||||
References: <cover.1495998948.git.fweimer@redhat.com>
|
||||
From: Florian Weimer <fweimer@redhat.com>
|
||||
Date: Sun, 28 May 2017 20:37:40 +0200
|
||||
Subject: [PATCH 1/3] rtld: Completely ignore LD_LIBRARY_PATH for AT_SECURE=1
|
||||
programs
|
||||
To: libc-alpha@sourceware.org
|
||||
|
||||
LD_LIBRARY_PATH can only be used to reorder system search paths, which
|
||||
is not useful functionality.
|
||||
---
|
||||
elf/rtld.c | 3 ++-
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/elf/rtld.c b/elf/rtld.c
|
||||
index 319ef06..824b6cf 100644
|
||||
--- a/elf/rtld.c
|
||||
+++ b/elf/rtld.c
|
||||
@@ -2419,7 +2419,8 @@ process_envvars (enum mode *modep)
|
||||
|
||||
case 12:
|
||||
/* The library search path. */
|
||||
- if (memcmp (envline, "LIBRARY_PATH", 12) == 0)
|
||||
+ if (!__libc_enable_secure
|
||||
+ && memcmp (envline, "LIBRARY_PATH", 12) == 0)
|
||||
{
|
||||
library_path = &envline[13];
|
||||
break;
|
||||
--
|
||||
2.9.4
|
||||
|
|
@ -1,115 +0,0 @@
|
|||
From 65ff0b7a085b85271ec8fde99f542281b495e3bc Mon Sep 17 00:00:00 2001
|
||||
Message-Id: <65ff0b7a085b85271ec8fde99f542281b495e3bc.1495998948.git.fweimer@redhat.com>
|
||||
In-Reply-To: <cover.1495998948.git.fweimer@redhat.com>
|
||||
References: <cover.1495998948.git.fweimer@redhat.com>
|
||||
From: Florian Weimer <fweimer@redhat.com>
|
||||
Date: Sun, 28 May 2017 20:57:40 +0200
|
||||
Subject: [PATCH 2/3] rtld: Reject overly long LD_PRELOAD path elements
|
||||
To: libc-alpha@sourceware.org
|
||||
|
||||
---
|
||||
elf/rtld.c | 69 +++++++++++++++++++++++++++++++++++++++++++++++---------------
|
||||
1 file changed, 53 insertions(+), 16 deletions(-)
|
||||
|
||||
diff --git a/elf/rtld.c b/elf/rtld.c
|
||||
index 824b6cf..30f0cae 100644
|
||||
--- a/elf/rtld.c
|
||||
+++ b/elf/rtld.c
|
||||
@@ -99,6 +99,22 @@ uintptr_t __pointer_chk_guard_local
|
||||
strong_alias (__pointer_chk_guard_local, __pointer_chk_guard)
|
||||
#endif
|
||||
|
||||
+/* Check that AT_SECURE=0, or that the passed name does not contain
|
||||
+ directories and is not overly long. Reject empty names
|
||||
+ unconditionally. */
|
||||
+static bool
|
||||
+dso_name_valid_for_suid (const char *p)
|
||||
+{
|
||||
+ if (__glibc_unlikely (__libc_enable_secure))
|
||||
+ {
|
||||
+ /* Ignore pathnames with directories for AT_SECURE=1
|
||||
+ programs, and also skip overlong names. */
|
||||
+ size_t len = strlen (p);
|
||||
+ if (len >= NAME_MAX || memchr (p, '/', len) != NULL)
|
||||
+ return false;
|
||||
+ }
|
||||
+ return *p != '\0';
|
||||
+}
|
||||
|
||||
/* List of auditing DSOs. */
|
||||
static struct audit_list
|
||||
@@ -716,6 +732,46 @@ static const char *preloadlist attribute_relro;
|
||||
/* Nonzero if information about versions has to be printed. */
|
||||
static int version_info attribute_relro;
|
||||
|
||||
+/* The LD_PRELOAD environment variable gives list of libraries
|
||||
+ separated by white space or colons that are loaded before the
|
||||
+ executable's dependencies and prepended to the global scope list.
|
||||
+ (If the binary is running setuid all elements containing a '/' are
|
||||
+ ignored since it is insecure.) Return the number of preloads
|
||||
+ performed. */
|
||||
+unsigned int
|
||||
+handle_ld_preload (const char *preloadlist, struct link_map *main_map)
|
||||
+{
|
||||
+ unsigned int npreloads = 0;
|
||||
+ const char *p = preloadlist;
|
||||
+#ifdef PATH_MAX
|
||||
+ char fname[PATH_MAX];
|
||||
+#else
|
||||
+ char fname[4096];
|
||||
+#endif
|
||||
+
|
||||
+ while (*p != '\0')
|
||||
+ {
|
||||
+ /* Split preload list at space/colon. */
|
||||
+ size_t len = strcspn (p, " :");
|
||||
+ if (len > 0 && len < sizeof(fname))
|
||||
+ {
|
||||
+ memcpy (fname, p, len);
|
||||
+ fname[len] = '\0';
|
||||
+ }
|
||||
+ else
|
||||
+ fname[0] = '\0';
|
||||
+
|
||||
+ /* Skip over the substring and the following delimiter. */
|
||||
+ p += len;
|
||||
+ if (*p == ' ' || *p == ':')
|
||||
+ ++p;
|
||||
+
|
||||
+ if (dso_name_valid_for_suid (fname))
|
||||
+ npreloads += do_preload (fname, main_map, "LD_PRELOAD");
|
||||
+ }
|
||||
+ return npreloads;
|
||||
+}
|
||||
+
|
||||
static void
|
||||
dl_main (const ElfW(Phdr) *phdr,
|
||||
ElfW(Word) phnum,
|
||||
@@ -1462,23 +1514,8 @@ ERROR: ld.so: object '%s' cannot be loaded as audit interface: %s; ignored.\n",
|
||||
|
||||
if (__glibc_unlikely (preloadlist != NULL))
|
||||
{
|
||||
- /* The LD_PRELOAD environment variable gives list of libraries
|
||||
- separated by white space or colons that are loaded before the
|
||||
- executable's dependencies and prepended to the global scope
|
||||
- list. If the binary is running setuid all elements
|
||||
- containing a '/' are ignored since it is insecure. */
|
||||
- char *list = strdupa (preloadlist);
|
||||
- char *p;
|
||||
-
|
||||
HP_TIMING_NOW (start);
|
||||
-
|
||||
- /* Prevent optimizing strsep. Speed is not important here. */
|
||||
- while ((p = (strsep) (&list, " :")) != NULL)
|
||||
- if (p[0] != '\0'
|
||||
- && (__builtin_expect (! __libc_enable_secure, 1)
|
||||
- || strchr (p, '/') == NULL))
|
||||
- npreloads += do_preload (p, main_map, "LD_PRELOAD");
|
||||
-
|
||||
+ npreloads += handle_ld_preload (preloadlist, main_map);
|
||||
HP_TIMING_NOW (stop);
|
||||
HP_TIMING_DIFF (diff, start, stop);
|
||||
HP_TIMING_ACCUM_NT (load_time, diff);
|
||||
--
|
||||
2.9.4
|
||||
|
|
@ -19,6 +19,7 @@
|
|||
let
|
||||
inherit (buildPackages) linuxHeaders;
|
||||
version = "2.25";
|
||||
patchSuffix = "-49";
|
||||
sha256 = "067bd9bb3390e79aa45911537d13c3721f1d9d3769931a30c2681bfee66f23a0";
|
||||
cross = if buildPlatform != hostPlatform then hostPlatform else null;
|
||||
in
|
||||
|
@ -38,7 +39,15 @@ stdenv.mkDerivation ({
|
|||
enableParallelBuilding = true;
|
||||
|
||||
patches =
|
||||
[ /* Have rpcgen(1) look for cpp(1) in $PATH. */
|
||||
[
|
||||
/* No tarballs for stable upstream branch, only https://sourceware.org/git/?p=glibc.git
|
||||
$ git co release/2.25/master; git describe
|
||||
glibc-2.25-49-gbc5ace67fe
|
||||
$ git show --reverse glibc-2.25..release/2.25/master | gzip -n -9 --rsyncable - > 2.25-49.patch.gz
|
||||
*/
|
||||
./2.25-49.patch.gz
|
||||
|
||||
/* Have rpcgen(1) look for cpp(1) in $PATH. */
|
||||
./rpcgen-path.patch
|
||||
|
||||
/* Allow NixOS and Nix to handle the locale-archive. */
|
||||
|
@ -50,24 +59,10 @@ stdenv.mkDerivation ({
|
|||
/* Don't use /etc/ld.so.preload, but /etc/ld-nix.so.preload. */
|
||||
./dont-use-system-ld-so-preload.patch
|
||||
|
||||
/* Add blowfish password hashing support. This is needed for
|
||||
compatibility with old NixOS installations (since NixOS used
|
||||
to default to blowfish). */
|
||||
./glibc-crypt-blowfish.patch
|
||||
|
||||
/* The command "getconf CS_PATH" returns the default search path
|
||||
"/bin:/usr/bin", which is inappropriate on NixOS machines. This
|
||||
patch extends the search path by "/run/current-system/sw/bin". */
|
||||
./fix_path_attribute_in_getconf.patch
|
||||
|
||||
/* Stack Clash */
|
||||
./CVE-2017-1000366-rtld-LD_LIBRARY_PATH.patch
|
||||
./CVE-2017-1000366-rtld-LD_PRELOAD.patch
|
||||
./CVE-2017-1000366-rtld-LD_AUDIT.patch
|
||||
]
|
||||
++ lib.optionals stdenv.isi686 [
|
||||
./fix-i686-memchr.patch
|
||||
./i686-fix-vectorized-strcspn.patch
|
||||
]
|
||||
++ lib.optional stdenv.isx86_64 ./fix-x64-abi.patch;
|
||||
|
||||
|
@ -90,12 +85,6 @@ stdenv.mkDerivation ({
|
|||
+ ''
|
||||
cat ${./glibc-remove-datetime-from-nscd.patch} \
|
||||
| sed "s,@out@,$out," | patch -p1
|
||||
''
|
||||
# CVE-2014-8121, see https://bugzilla.redhat.com/show_bug.cgi?id=1165192
|
||||
+ ''
|
||||
substituteInPlace ./nss/nss_files/files-XXX.c \
|
||||
--replace 'status = internal_setent (stayopen);' \
|
||||
'status = internal_setent (1);'
|
||||
'';
|
||||
|
||||
configureFlags =
|
||||
|
@ -145,7 +134,7 @@ stdenv.mkDerivation ({
|
|||
// (removeAttrs args [ "withLinuxHeaders" "withGd" ]) //
|
||||
|
||||
{
|
||||
name = name + "-${version}" +
|
||||
name = name + "-${version}${patchSuffix}" +
|
||||
lib.optionalString (cross != null) "-${cross.config}";
|
||||
|
||||
src = fetchurl {
|
||||
|
|
|
@ -1,23 +0,0 @@
|
|||
Fix i686 memchr overflow calculation (BZ#21182)
|
||||
|
||||
https://sourceware.org/git/?p=glibc.git;a=commit;h=3abeeec5f46ff03
|
||||
diff --git a/sysdeps/i386/i686/multiarch/memchr-sse2.S b/sysdeps/i386/i686/multiarch/memchr-sse2.S
|
||||
index 910679c..e41f324 100644
|
||||
--- a/sysdeps/i386/i686/multiarch/memchr-sse2.S
|
||||
+++ b/sysdeps/i386/i686/multiarch/memchr-sse2.S
|
||||
@@ -117,7 +117,6 @@ L(crosscache):
|
||||
|
||||
# ifndef USE_AS_RAWMEMCHR
|
||||
jnz L(match_case2_prolog1)
|
||||
- lea -16(%edx), %edx
|
||||
/* Calculate the last acceptable address and check for possible
|
||||
addition overflow by using satured math:
|
||||
edx = ecx + edx
|
||||
@@ -125,6 +124,7 @@ L(crosscache):
|
||||
add %ecx, %edx
|
||||
sbb %eax, %eax
|
||||
or %eax, %edx
|
||||
+ sub $16, %edx
|
||||
jbe L(return_null)
|
||||
lea 16(%edi), %edi
|
||||
# else
|
|
@ -1,795 +0,0 @@
|
|||
From http://cvs.pld-linux.org/cgi-bin/viewvc.cgi/cvs/packages/glibc/glibc-crypt-blowfish.patch?revision=1.7&view=markup
|
||||
|
||||
diff -ru -N glibc-2.17-orig/crypt/crypt_blowfish.c glibc-2.17/crypt/crypt_blowfish.c
|
||||
--- glibc-2.17-orig/crypt/crypt_blowfish.c 1970-01-01 01:00:00.000000000 +0100
|
||||
+++ glibc-2.17/crypt/crypt_blowfish.c 2013-01-22 23:30:12.340353965 +0100
|
||||
@@ -0,0 +1,743 @@
|
||||
+/*
|
||||
+ * This code comes from John the Ripper password cracker, with reentrant
|
||||
+ * and crypt(3) interfaces added, but optimizations specific to password
|
||||
+ * cracking removed.
|
||||
+ *
|
||||
+ * Written by Solar Designer <solar at openwall.com> in 1998-2002 and
|
||||
+ * placed in the public domain.
|
||||
+ *
|
||||
+ * There's absolutely no warranty.
|
||||
+ *
|
||||
+ * It is my intent that you should be able to use this on your system,
|
||||
+ * as a part of a software package, or anywhere else to improve security,
|
||||
+ * ensure compatibility, or for any other purpose. I would appreciate
|
||||
+ * it if you give credit where it is due and keep your modifications in
|
||||
+ * the public domain as well, but I don't require that in order to let
|
||||
+ * you place this code and any modifications you make under a license
|
||||
+ * of your choice.
|
||||
+ *
|
||||
+ * This implementation is compatible with OpenBSD bcrypt.c (version 2a)
|
||||
+ * by Niels Provos <provos at citi.umich.edu>, and uses some of his
|
||||
+ * ideas. The password hashing algorithm was designed by David Mazieres
|
||||
+ * <dm at lcs.mit.edu>.
|
||||
+ *
|
||||
+ * There's a paper on the algorithm that explains its design decisions:
|
||||
+ *
|
||||
+ * http://www.usenix.org/events/usenix99/provos.html
|
||||
+ *
|
||||
+ * Some of the tricks in BF_ROUND might be inspired by Eric Young's
|
||||
+ * Blowfish library (I can't be sure if I would think of something if I
|
||||
+ * hadn't seen his code).
|
||||
+ */
|
||||
+
|
||||
+#include <string.h>
|
||||
+
|
||||
+#include <errno.h>
|
||||
+#ifndef __set_errno
|
||||
+#define __set_errno(val) errno = (val)
|
||||
+#endif
|
||||
+
|
||||
+#undef __CONST
|
||||
+#ifdef __GNUC__
|
||||
+#define __CONST __const
|
||||
+#else
|
||||
+#define __CONST
|
||||
+#endif
|
||||
+
|
||||
+#ifdef __i386__
|
||||
+#define BF_ASM 0 /* original OW patch has 1 */
|
||||
+#define BF_SCALE 1
|
||||
+#elif defined(__alpha__) || defined(__hppa__) || defined(__x86_64__)
|
||||
+#define BF_ASM 0
|
||||
+#define BF_SCALE 1
|
||||
+#else
|
||||
+#define BF_ASM 0
|
||||
+#define BF_SCALE 0
|
||||
+#endif
|
||||
+
|
||||
+typedef unsigned int BF_word;
|
||||
+
|
||||
+/* Number of Blowfish rounds, this is also hardcoded into a few places */
|
||||
+#define BF_N 16
|
||||
+
|
||||
+typedef BF_word BF_key[BF_N + 2];
|
||||
+
|
||||
+typedef struct {
|
||||
+ BF_word S[4][0x100];
|
||||
+ BF_key P;
|
||||
+} BF_ctx;
|
||||
+
|
||||
+/*
|
||||
+ * Magic IV for 64 Blowfish encryptions that we do at the end.
|
||||
+ * The string is "OrpheanBeholderScryDoubt" on big-endian.
|
||||
+ */
|
||||
+static BF_word BF_magic_w[6] = {
|
||||
+ 0x4F727068, 0x65616E42, 0x65686F6C,
|
||||
+ 0x64657253, 0x63727944, 0x6F756274
|
||||
+};
|
||||
+
|
||||
+/*
|
||||
+ * P-box and S-box tables initialized with digits of Pi.
|
||||
+ */
|
||||
+static BF_ctx BF_init_state = {
|
||||
+ {
|
||||
+ {
|
||||
+ 0xd1310ba6, 0x98dfb5ac, 0x2ffd72db, 0xd01adfb7,
|
||||
+ 0xb8e1afed, 0x6a267e96, 0xba7c9045, 0xf12c7f99,
|
||||
+ 0x24a19947, 0xb3916cf7, 0x0801f2e2, 0x858efc16,
|
||||
+ 0x636920d8, 0x71574e69, 0xa458fea3, 0xf4933d7e,
|
||||
+ 0x0d95748f, 0x728eb658, 0x718bcd58, 0x82154aee,
|
||||
+ 0x7b54a41d, 0xc25a59b5, 0x9c30d539, 0x2af26013,
|
||||
+ 0xc5d1b023, 0x286085f0, 0xca417918, 0xb8db38ef,
|
||||
+ 0x8e79dcb0, 0x603a180e, 0x6c9e0e8b, 0xb01e8a3e,
|
||||
+ 0xd71577c1, 0xbd314b27, 0x78af2fda, 0x55605c60,
|
||||
+ 0xe65525f3, 0xaa55ab94, 0x57489862, 0x63e81440,
|
||||
+ 0x55ca396a, 0x2aab10b6, 0xb4cc5c34, 0x1141e8ce,
|
||||
+ 0xa15486af, 0x7c72e993, 0xb3ee1411, 0x636fbc2a,
|
||||
+ 0x2ba9c55d, 0x741831f6, 0xce5c3e16, 0x9b87931e,
|
||||
+ 0xafd6ba33, 0x6c24cf5c, 0x7a325381, 0x28958677,
|
||||
+ 0x3b8f4898, 0x6b4bb9af, 0xc4bfe81b, 0x66282193,
|
||||
+ 0x61d809cc, 0xfb21a991, 0x487cac60, 0x5dec8032,
|
||||
+ 0xef845d5d, 0xe98575b1, 0xdc262302, 0xeb651b88,
|
||||
+ 0x23893e81, 0xd396acc5, 0x0f6d6ff3, 0x83f44239,
|
||||
+ 0x2e0b4482, 0xa4842004, 0x69c8f04a, 0x9e1f9b5e,
|
||||
+ 0x21c66842, 0xf6e96c9a, 0x670c9c61, 0xabd388f0,
|
||||
+ 0x6a51a0d2, 0xd8542f68, 0x960fa728, 0xab5133a3,
|
||||
+ 0x6eef0b6c, 0x137a3be4, 0xba3bf050, 0x7efb2a98,
|
||||
+ 0xa1f1651d, 0x39af0176, 0x66ca593e, 0x82430e88,
|
||||
+ 0x8cee8619, 0x456f9fb4, 0x7d84a5c3, 0x3b8b5ebe,
|
||||
+ 0xe06f75d8, 0x85c12073, 0x401a449f, 0x56c16aa6,
|
||||
+ 0x4ed3aa62, 0x363f7706, 0x1bfedf72, 0x429b023d,
|
||||
+ 0x37d0d724, 0xd00a1248, 0xdb0fead3, 0x49f1c09b,
|
||||
+ 0x075372c9, 0x80991b7b, 0x25d479d8, 0xf6e8def7,
|
||||
+ 0xe3fe501a, 0xb6794c3b, 0x976ce0bd, 0x04c006ba,
|
||||
+ 0xc1a94fb6, 0x409f60c4, 0x5e5c9ec2, 0x196a2463,
|
||||
+ 0x68fb6faf, 0x3e6c53b5, 0x1339b2eb, 0x3b52ec6f,
|
||||
+ 0x6dfc511f, 0x9b30952c, 0xcc814544, 0xaf5ebd09,
|
||||
+ 0xbee3d004, 0xde334afd, 0x660f2807, 0x192e4bb3,
|
||||
+ 0xc0cba857, 0x45c8740f, 0xd20b5f39, 0xb9d3fbdb,
|
||||
+ 0x5579c0bd, 0x1a60320a, 0xd6a100c6, 0x402c7279,
|
||||
+ 0x679f25fe, 0xfb1fa3cc, 0x8ea5e9f8, 0xdb3222f8,
|
||||
+ 0x3c7516df, 0xfd616b15, 0x2f501ec8, 0xad0552ab,
|
||||
+ 0x323db5fa, 0xfd238760, 0x53317b48, 0x3e00df82,
|
||||
+ 0x9e5c57bb, 0xca6f8ca0, 0x1a87562e, 0xdf1769db,
|
||||
+ 0xd542a8f6, 0x287effc3, 0xac6732c6, 0x8c4f5573,
|
||||
+ 0x695b27b0, 0xbbca58c8, 0xe1ffa35d, 0xb8f011a0,
|
||||
+ 0x10fa3d98, 0xfd2183b8, 0x4afcb56c, 0x2dd1d35b,
|
||||
+ 0x9a53e479, 0xb6f84565, 0xd28e49bc, 0x4bfb9790,
|
||||
+ 0xe1ddf2da, 0xa4cb7e33, 0x62fb1341, 0xcee4c6e8,
|
||||
+ 0xef20cada, 0x36774c01, 0xd07e9efe, 0x2bf11fb4,
|
||||
+ 0x95dbda4d, 0xae909198, 0xeaad8e71, 0x6b93d5a0,
|
||||
+ 0xd08ed1d0, 0xafc725e0, 0x8e3c5b2f, 0x8e7594b7,
|
||||
+ 0x8ff6e2fb, 0xf2122b64, 0x8888b812, 0x900df01c,
|
||||
+ 0x4fad5ea0, 0x688fc31c, 0xd1cff191, 0xb3a8c1ad,
|
||||
+ 0x2f2f2218, 0xbe0e1777, 0xea752dfe, 0x8b021fa1,
|
||||
+ 0xe5a0cc0f, 0xb56f74e8, 0x18acf3d6, 0xce89e299,
|
||||
+ 0xb4a84fe0, 0xfd13e0b7, 0x7cc43b81, 0xd2ada8d9,
|
||||
+ 0x165fa266, 0x80957705, 0x93cc7314, 0x211a1477,
|
||||
+ 0xe6ad2065, 0x77b5fa86, 0xc75442f5, 0xfb9d35cf,
|
||||
+ 0xebcdaf0c, 0x7b3e89a0, 0xd6411bd3, 0xae1e7e49,
|
||||
+ 0x00250e2d, 0x2071b35e, 0x226800bb, 0x57b8e0af,
|
||||
+ 0x2464369b, 0xf009b91e, 0x5563911d, 0x59dfa6aa,
|
||||
+ 0x78c14389, 0xd95a537f, 0x207d5ba2, 0x02e5b9c5,
|
||||
+ 0x83260376, 0x6295cfa9, 0x11c81968, 0x4e734a41,
|
||||
+ 0xb3472dca, 0x7b14a94a, 0x1b510052, 0x9a532915,
|
||||
+ 0xd60f573f, 0xbc9bc6e4, 0x2b60a476, 0x81e67400,
|
||||
+ 0x08ba6fb5, 0x571be91f, 0xf296ec6b, 0x2a0dd915,
|
||||
+ 0xb6636521, 0xe7b9f9b6, 0xff34052e, 0xc5855664,
|
||||
+ 0x53b02d5d, 0xa99f8fa1, 0x08ba4799, 0x6e85076a
|
||||
+ }, {
|
||||
+ 0x4b7a70e9, 0xb5b32944, 0xdb75092e, 0xc4192623,
|
||||
+ 0xad6ea6b0, 0x49a7df7d, 0x9cee60b8, 0x8fedb266,
|
||||
+ 0xecaa8c71, 0x699a17ff, 0x5664526c, 0xc2b19ee1,
|
||||
+ 0x193602a5, 0x75094c29, 0xa0591340, 0xe4183a3e,
|
||||
+ 0x3f54989a, 0x5b429d65, 0x6b8fe4d6, 0x99f73fd6,
|
||||
+ 0xa1d29c07, 0xefe830f5, 0x4d2d38e6, 0xf0255dc1,
|
||||
+ 0x4cdd2086, 0x8470eb26, 0x6382e9c6, 0x021ecc5e,
|
||||
+ 0x09686b3f, 0x3ebaefc9, 0x3c971814, 0x6b6a70a1,
|
||||
+ 0x687f3584, 0x52a0e286, 0xb79c5305, 0xaa500737,
|
||||
+ 0x3e07841c, 0x7fdeae5c, 0x8e7d44ec, 0x5716f2b8,
|
||||
+ 0xb03ada37, 0xf0500c0d, 0xf01c1f04, 0x0200b3ff,
|
||||
+ 0xae0cf51a, 0x3cb574b2, 0x25837a58, 0xdc0921bd,
|
||||
+ 0xd19113f9, 0x7ca92ff6, 0x94324773, 0x22f54701,
|
||||
+ 0x3ae5e581, 0x37c2dadc, 0xc8b57634, 0x9af3dda7,
|
||||
+ 0xa9446146, 0x0fd0030e, 0xecc8c73e, 0xa4751e41,
|
||||
+ 0xe238cd99, 0x3bea0e2f, 0x3280bba1, 0x183eb331,
|
||||
+ 0x4e548b38, 0x4f6db908, 0x6f420d03, 0xf60a04bf,
|
||||
+ 0x2cb81290, 0x24977c79, 0x5679b072, 0xbcaf89af,
|
||||
+ 0xde9a771f, 0xd9930810, 0xb38bae12, 0xdccf3f2e,
|
||||
+ 0x5512721f, 0x2e6b7124, 0x501adde6, 0x9f84cd87,
|
||||
+ 0x7a584718, 0x7408da17, 0xbc9f9abc, 0xe94b7d8c,
|
||||
+ 0xec7aec3a, 0xdb851dfa, 0x63094366, 0xc464c3d2,
|
||||
+ 0xef1c1847, 0x3215d908, 0xdd433b37, 0x24c2ba16,
|
||||
+ 0x12a14d43, 0x2a65c451, 0x50940002, 0x133ae4dd,
|
||||
+ 0x71dff89e, 0x10314e55, 0x81ac77d6, 0x5f11199b,
|
||||
+ 0x043556f1, 0xd7a3c76b, 0x3c11183b, 0x5924a509,
|
||||
+ 0xf28fe6ed, 0x97f1fbfa, 0x9ebabf2c, 0x1e153c6e,
|
||||
+ 0x86e34570, 0xeae96fb1, 0x860e5e0a, 0x5a3e2ab3,
|
||||
+ 0x771fe71c, 0x4e3d06fa, 0x2965dcb9, 0x99e71d0f,
|
||||
+ 0x803e89d6, 0x5266c825, 0x2e4cc978, 0x9c10b36a,
|
||||
+ 0xc6150eba, 0x94e2ea78, 0xa5fc3c53, 0x1e0a2df4,
|
||||
+ 0xf2f74ea7, 0x361d2b3d, 0x1939260f, 0x19c27960,
|
||||
+ 0x5223a708, 0xf71312b6, 0xebadfe6e, 0xeac31f66,
|
||||
+ 0xe3bc4595, 0xa67bc883, 0xb17f37d1, 0x018cff28,
|
||||
+ 0xc332ddef, 0xbe6c5aa5, 0x65582185, 0x68ab9802,
|
||||
+ 0xeecea50f, 0xdb2f953b, 0x2aef7dad, 0x5b6e2f84,
|
||||
+ 0x1521b628, 0x29076170, 0xecdd4775, 0x619f1510,
|
||||
+ 0x13cca830, 0xeb61bd96, 0x0334fe1e, 0xaa0363cf,
|
||||
+ 0xb5735c90, 0x4c70a239, 0xd59e9e0b, 0xcbaade14,
|
||||
+ 0xeecc86bc, 0x60622ca7, 0x9cab5cab, 0xb2f3846e,
|
||||
+ 0x648b1eaf, 0x19bdf0ca, 0xa02369b9, 0x655abb50,
|
||||
+ 0x40685a32, 0x3c2ab4b3, 0x319ee9d5, 0xc021b8f7,
|
||||
+ 0x9b540b19, 0x875fa099, 0x95f7997e, 0x623d7da8,
|
||||
+ 0xf837889a, 0x97e32d77, 0x11ed935f, 0x16681281,
|
||||
+ 0x0e358829, 0xc7e61fd6, 0x96dedfa1, 0x7858ba99,
|
||||
+ 0x57f584a5, 0x1b227263, 0x9b83c3ff, 0x1ac24696,
|
||||
+ 0xcdb30aeb, 0x532e3054, 0x8fd948e4, 0x6dbc3128,
|
||||
+ 0x58ebf2ef, 0x34c6ffea, 0xfe28ed61, 0xee7c3c73,
|
||||
+ 0x5d4a14d9, 0xe864b7e3, 0x42105d14, 0x203e13e0,
|
||||
+ 0x45eee2b6, 0xa3aaabea, 0xdb6c4f15, 0xfacb4fd0,
|
||||
+ 0xc742f442, 0xef6abbb5, 0x654f3b1d, 0x41cd2105,
|
||||
+ 0xd81e799e, 0x86854dc7, 0xe44b476a, 0x3d816250,
|
||||
+ 0xcf62a1f2, 0x5b8d2646, 0xfc8883a0, 0xc1c7b6a3,
|
||||
+ 0x7f1524c3, 0x69cb7492, 0x47848a0b, 0x5692b285,
|
||||
+ 0x095bbf00, 0xad19489d, 0x1462b174, 0x23820e00,
|
||||
+ 0x58428d2a, 0x0c55f5ea, 0x1dadf43e, 0x233f7061,
|
||||
+ 0x3372f092, 0x8d937e41, 0xd65fecf1, 0x6c223bdb,
|
||||
+ 0x7cde3759, 0xcbee7460, 0x4085f2a7, 0xce77326e,
|
||||
+ 0xa6078084, 0x19f8509e, 0xe8efd855, 0x61d99735,
|
||||
+ 0xa969a7aa, 0xc50c06c2, 0x5a04abfc, 0x800bcadc,
|
||||
+ 0x9e447a2e, 0xc3453484, 0xfdd56705, 0x0e1e9ec9,
|
||||
+ 0xdb73dbd3, 0x105588cd, 0x675fda79, 0xe3674340,
|
||||
+ 0xc5c43465, 0x713e38d8, 0x3d28f89e, 0xf16dff20,
|
||||
+ 0x153e21e7, 0x8fb03d4a, 0xe6e39f2b, 0xdb83adf7
|
||||
+ }, {
|
||||
+ 0xe93d5a68, 0x948140f7, 0xf64c261c, 0x94692934,
|
||||
+ 0x411520f7, 0x7602d4f7, 0xbcf46b2e, 0xd4a20068,
|
||||
+ 0xd4082471, 0x3320f46a, 0x43b7d4b7, 0x500061af,
|
||||
+ 0x1e39f62e, 0x97244546, 0x14214f74, 0xbf8b8840,
|
||||
+ 0x4d95fc1d, 0x96b591af, 0x70f4ddd3, 0x66a02f45,
|
||||
+ 0xbfbc09ec, 0x03bd9785, 0x7fac6dd0, 0x31cb8504,
|
||||
+ 0x96eb27b3, 0x55fd3941, 0xda2547e6, 0xabca0a9a,
|
||||
+ 0x28507825, 0x530429f4, 0x0a2c86da, 0xe9b66dfb,
|
||||
+ 0x68dc1462, 0xd7486900, 0x680ec0a4, 0x27a18dee,
|
||||
+ 0x4f3ffea2, 0xe887ad8c, 0xb58ce006, 0x7af4d6b6,
|
||||
+ 0xaace1e7c, 0xd3375fec, 0xce78a399, 0x406b2a42,
|
||||
+ 0x20fe9e35, 0xd9f385b9, 0xee39d7ab, 0x3b124e8b,
|
||||
+ 0x1dc9faf7, 0x4b6d1856, 0x26a36631, 0xeae397b2,
|
||||
+ 0x3a6efa74, 0xdd5b4332, 0x6841e7f7, 0xca7820fb,
|
||||
+ 0xfb0af54e, 0xd8feb397, 0x454056ac, 0xba489527,
|
||||
+ 0x55533a3a, 0x20838d87, 0xfe6ba9b7, 0xd096954b,
|
||||
+ 0x55a867bc, 0xa1159a58, 0xcca92963, 0x99e1db33,
|
||||
+ 0xa62a4a56, 0x3f3125f9, 0x5ef47e1c, 0x9029317c,
|
||||
+ 0xfdf8e802, 0x04272f70, 0x80bb155c, 0x05282ce3,
|
||||
+ 0x95c11548, 0xe4c66d22, 0x48c1133f, 0xc70f86dc,
|
||||
+ 0x07f9c9ee, 0x41041f0f, 0x404779a4, 0x5d886e17,
|
||||
+ 0x325f51eb, 0xd59bc0d1, 0xf2bcc18f, 0x41113564,
|
||||
+ 0x257b7834, 0x602a9c60, 0xdff8e8a3, 0x1f636c1b,
|
||||
+ 0x0e12b4c2, 0x02e1329e, 0xaf664fd1, 0xcad18115,
|
||||
+ 0x6b2395e0, 0x333e92e1, 0x3b240b62, 0xeebeb922,
|
||||
+ 0x85b2a20e, 0xe6ba0d99, 0xde720c8c, 0x2da2f728,
|
||||
+ 0xd0127845, 0x95b794fd, 0x647d0862, 0xe7ccf5f0,
|
||||
+ 0x5449a36f, 0x877d48fa, 0xc39dfd27, 0xf33e8d1e,
|
||||
+ 0x0a476341, 0x992eff74, 0x3a6f6eab, 0xf4f8fd37,
|
||||
+ 0xa812dc60, 0xa1ebddf8, 0x991be14c, 0xdb6e6b0d,
|
||||
+ 0xc67b5510, 0x6d672c37, 0x2765d43b, 0xdcd0e804,
|
||||
+ 0xf1290dc7, 0xcc00ffa3, 0xb5390f92, 0x690fed0b,
|
||||
+ 0x667b9ffb, 0xcedb7d9c, 0xa091cf0b, 0xd9155ea3,
|
||||
+ 0xbb132f88, 0x515bad24, 0x7b9479bf, 0x763bd6eb,
|
||||
+ 0x37392eb3, 0xcc115979, 0x8026e297, 0xf42e312d,
|
||||
+ 0x6842ada7, 0xc66a2b3b, 0x12754ccc, 0x782ef11c,
|
||||
+ 0x6a124237, 0xb79251e7, 0x06a1bbe6, 0x4bfb6350,
|
||||
+ 0x1a6b1018, 0x11caedfa, 0x3d25bdd8, 0xe2e1c3c9,
|
||||
+ 0x44421659, 0x0a121386, 0xd90cec6e, 0xd5abea2a,
|
||||
+ 0x64af674e, 0xda86a85f, 0xbebfe988, 0x64e4c3fe,
|
||||
+ 0x9dbc8057, 0xf0f7c086, 0x60787bf8, 0x6003604d,
|
||||
+ 0xd1fd8346, 0xf6381fb0, 0x7745ae04, 0xd736fccc,
|
||||
+ 0x83426b33, 0xf01eab71, 0xb0804187, 0x3c005e5f,
|
||||
+ 0x77a057be, 0xbde8ae24, 0x55464299, 0xbf582e61,
|
||||
+ 0x4e58f48f, 0xf2ddfda2, 0xf474ef38, 0x8789bdc2,
|
||||
+ 0x5366f9c3, 0xc8b38e74, 0xb475f255, 0x46fcd9b9,
|
||||
+ 0x7aeb2661, 0x8b1ddf84, 0x846a0e79, 0x915f95e2,
|
||||
+ 0x466e598e, 0x20b45770, 0x8cd55591, 0xc902de4c,
|
||||
+ 0xb90bace1, 0xbb8205d0, 0x11a86248, 0x7574a99e,
|
||||
+ 0xb77f19b6, 0xe0a9dc09, 0x662d09a1, 0xc4324633,
|
||||
+ 0xe85a1f02, 0x09f0be8c, 0x4a99a025, 0x1d6efe10,
|
||||
+ 0x1ab93d1d, 0x0ba5a4df, 0xa186f20f, 0x2868f169,
|
||||
+ 0xdcb7da83, 0x573906fe, 0xa1e2ce9b, 0x4fcd7f52,
|
||||
+ 0x50115e01, 0xa70683fa, 0xa002b5c4, 0x0de6d027,
|
||||
+ 0x9af88c27, 0x773f8641, 0xc3604c06, 0x61a806b5,
|
||||
+ 0xf0177a28, 0xc0f586e0, 0x006058aa, 0x30dc7d62,
|
||||
+ 0x11e69ed7, 0x2338ea63, 0x53c2dd94, 0xc2c21634,
|
||||
+ 0xbbcbee56, 0x90bcb6de, 0xebfc7da1, 0xce591d76,
|
||||
+ 0x6f05e409, 0x4b7c0188, 0x39720a3d, 0x7c927c24,
|
||||
+ 0x86e3725f, 0x724d9db9, 0x1ac15bb4, 0xd39eb8fc,
|
||||
+ 0xed545578, 0x08fca5b5, 0xd83d7cd3, 0x4dad0fc4,
|
||||
+ 0x1e50ef5e, 0xb161e6f8, 0xa28514d9, 0x6c51133c,
|
||||
+ 0x6fd5c7e7, 0x56e14ec4, 0x362abfce, 0xddc6c837,
|
||||
+ 0xd79a3234, 0x92638212, 0x670efa8e, 0x406000e0
|
||||
+ }, {
|
||||
+ 0x3a39ce37, 0xd3faf5cf, 0xabc27737, 0x5ac52d1b,
|
||||
+ 0x5cb0679e, 0x4fa33742, 0xd3822740, 0x99bc9bbe,
|
||||
+ 0xd5118e9d, 0xbf0f7315, 0xd62d1c7e, 0xc700c47b,
|
||||
+ 0xb78c1b6b, 0x21a19045, 0xb26eb1be, 0x6a366eb4,
|
||||
+ 0x5748ab2f, 0xbc946e79, 0xc6a376d2, 0x6549c2c8,
|
||||
+ 0x530ff8ee, 0x468dde7d, 0xd5730a1d, 0x4cd04dc6,
|
||||
+ 0x2939bbdb, 0xa9ba4650, 0xac9526e8, 0xbe5ee304,
|
||||
+ 0xa1fad5f0, 0x6a2d519a, 0x63ef8ce2, 0x9a86ee22,
|
||||
+ 0xc089c2b8, 0x43242ef6, 0xa51e03aa, 0x9cf2d0a4,
|
||||
+ 0x83c061ba, 0x9be96a4d, 0x8fe51550, 0xba645bd6,
|
||||
+ 0x2826a2f9, 0xa73a3ae1, 0x4ba99586, 0xef5562e9,
|
||||
+ 0xc72fefd3, 0xf752f7da, 0x3f046f69, 0x77fa0a59,
|
||||
+ 0x80e4a915, 0x87b08601, 0x9b09e6ad, 0x3b3ee593,
|
||||
+ 0xe990fd5a, 0x9e34d797, 0x2cf0b7d9, 0x022b8b51,
|
||||
+ 0x96d5ac3a, 0x017da67d, 0xd1cf3ed6, 0x7c7d2d28,
|
||||
+ 0x1f9f25cf, 0xadf2b89b, 0x5ad6b472, 0x5a88f54c,
|
||||
+ 0xe029ac71, 0xe019a5e6, 0x47b0acfd, 0xed93fa9b,
|
||||
+ 0xe8d3c48d, 0x283b57cc, 0xf8d56629, 0x79132e28,
|
||||
+ 0x785f0191, 0xed756055, 0xf7960e44, 0xe3d35e8c,
|
||||
+ 0x15056dd4, 0x88f46dba, 0x03a16125, 0x0564f0bd,
|
||||
+ 0xc3eb9e15, 0x3c9057a2, 0x97271aec, 0xa93a072a,
|
||||
+ 0x1b3f6d9b, 0x1e6321f5, 0xf59c66fb, 0x26dcf319,
|
||||
+ 0x7533d928, 0xb155fdf5, 0x03563482, 0x8aba3cbb,
|
||||
+ 0x28517711, 0xc20ad9f8, 0xabcc5167, 0xccad925f,
|
||||
+ 0x4de81751, 0x3830dc8e, 0x379d5862, 0x9320f991,
|
||||
+ 0xea7a90c2, 0xfb3e7bce, 0x5121ce64, 0x774fbe32,
|
||||
+ 0xa8b6e37e, 0xc3293d46, 0x48de5369, 0x6413e680,
|
||||
+ 0xa2ae0810, 0xdd6db224, 0x69852dfd, 0x09072166,
|
||||
+ 0xb39a460a, 0x6445c0dd, 0x586cdecf, 0x1c20c8ae,
|
||||
+ 0x5bbef7dd, 0x1b588d40, 0xccd2017f, 0x6bb4e3bb,
|
||||
+ 0xdda26a7e, 0x3a59ff45, 0x3e350a44, 0xbcb4cdd5,
|
||||
+ 0x72eacea8, 0xfa6484bb, 0x8d6612ae, 0xbf3c6f47,
|
||||
+ 0xd29be463, 0x542f5d9e, 0xaec2771b, 0xf64e6370,
|
||||
+ 0x740e0d8d, 0xe75b1357, 0xf8721671, 0xaf537d5d,
|
||||
+ 0x4040cb08, 0x4eb4e2cc, 0x34d2466a, 0x0115af84,
|
||||
+ 0xe1b00428, 0x95983a1d, 0x06b89fb4, 0xce6ea048,
|
||||
+ 0x6f3f3b82, 0x3520ab82, 0x011a1d4b, 0x277227f8,
|
||||
+ 0x611560b1, 0xe7933fdc, 0xbb3a792b, 0x344525bd,
|
||||
+ 0xa08839e1, 0x51ce794b, 0x2f32c9b7, 0xa01fbac9,
|
||||
+ 0xe01cc87e, 0xbcc7d1f6, 0xcf0111c3, 0xa1e8aac7,
|
||||
+ 0x1a908749, 0xd44fbd9a, 0xd0dadecb, 0xd50ada38,
|
||||
+ 0x0339c32a, 0xc6913667, 0x8df9317c, 0xe0b12b4f,
|
||||
+ 0xf79e59b7, 0x43f5bb3a, 0xf2d519ff, 0x27d9459c,
|
||||
+ 0xbf97222c, 0x15e6fc2a, 0x0f91fc71, 0x9b941525,
|
||||
+ 0xfae59361, 0xceb69ceb, 0xc2a86459, 0x12baa8d1,
|
||||
+ 0xb6c1075e, 0xe3056a0c, 0x10d25065, 0xcb03a442,
|
||||
+ 0xe0ec6e0e, 0x1698db3b, 0x4c98a0be, 0x3278e964,
|
||||
+ 0x9f1f9532, 0xe0d392df, 0xd3a0342b, 0x8971f21e,
|
||||
+ 0x1b0a7441, 0x4ba3348c, 0xc5be7120, 0xc37632d8,
|
||||
+ 0xdf359f8d, 0x9b992f2e, 0xe60b6f47, 0x0fe3f11d,
|
||||
+ 0xe54cda54, 0x1edad891, 0xce6279cf, 0xcd3e7e6f,
|
||||
+ 0x1618b166, 0xfd2c1d05, 0x848fd2c5, 0xf6fb2299,
|
||||
+ 0xf523f357, 0xa6327623, 0x93a83531, 0x56cccd02,
|
||||
+ 0xacf08162, 0x5a75ebb5, 0x6e163697, 0x88d273cc,
|
||||
+ 0xde966292, 0x81b949d0, 0x4c50901b, 0x71c65614,
|
||||
+ 0xe6c6c7bd, 0x327a140a, 0x45e1d006, 0xc3f27b9a,
|
||||
+ 0xc9aa53fd, 0x62a80f00, 0xbb25bfe2, 0x35bdd2f6,
|
||||
+ 0x71126905, 0xb2040222, 0xb6cbcf7c, 0xcd769c2b,
|
||||
+ 0x53113ec0, 0x1640e3d3, 0x38abbd60, 0x2547adf0,
|
||||
+ 0xba38209c, 0xf746ce76, 0x77afa1c5, 0x20756060,
|
||||
+ 0x85cbfe4e, 0x8ae88dd8, 0x7aaaf9b0, 0x4cf9aa7e,
|
||||
+ 0x1948c25c, 0x02fb8a8c, 0x01c36ae4, 0xd6ebe1f9,
|
||||
+ 0x90d4f869, 0xa65cdea0, 0x3f09252d, 0xc208e69f,
|
||||
+ 0xb74e6132, 0xce77e25b, 0x578fdfe3, 0x3ac372e6
|
||||
+ }
|
||||
+ }, {
|
||||
+ 0x243f6a88, 0x85a308d3, 0x13198a2e, 0x03707344,
|
||||
+ 0xa4093822, 0x299f31d0, 0x082efa98, 0xec4e6c89,
|
||||
+ 0x452821e6, 0x38d01377, 0xbe5466cf, 0x34e90c6c,
|
||||
+ 0xc0ac29b7, 0xc97c50dd, 0x3f84d5b5, 0xb5470917,
|
||||
+ 0x9216d5d9, 0x8979fb1b
|
||||
+ }
|
||||
+};
|
||||
+
|
||||
+static unsigned char BF_itoa64[64 + 1] =
|
||||
+ "./ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
|
||||
+
|
||||
+static unsigned char BF_atoi64[0x60] = {
|
||||
+ 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 0, 1,
|
||||
+ 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 64, 64, 64, 64, 64,
|
||||
+ 64, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16,
|
||||
+ 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 64, 64, 64, 64, 64,
|
||||
+ 64, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42,
|
||||
+ 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 64, 64, 64, 64, 64
|
||||
+};
|
||||
+
|
||||
+/*
|
||||
+ * This may be optimized out if built with function inlining and no BF_ASM.
|
||||
+ */
|
||||
+static void clean(void *data, int size)
|
||||
+{
|
||||
+#if BF_ASM
|
||||
+ extern void _BF_clean(void *data);
|
||||
+#endif
|
||||
+ memset(data, 0, size);
|
||||
+#if BF_ASM
|
||||
+ _BF_clean(data);
|
||||
+#endif
|
||||
+}
|
||||
+
|
||||
+#define BF_safe_atoi64(dst, src) \
|
||||
+{ \
|
||||
+ tmp = (unsigned char)(src); \
|
||||
+ if ((unsigned int)(tmp -= 0x20) >= 0x60) return -1; \
|
||||
+ tmp = BF_atoi64[tmp]; \
|
||||
+ if (tmp > 63) return -1; \
|
||||
+ (dst) = tmp; \
|
||||
+}
|
||||
+
|
||||
+static int BF_decode(BF_word *dst, __CONST char *src, int size)
|
||||
+{
|
||||
+ unsigned char *dptr = (unsigned char *)dst;
|
||||
+ unsigned char *end = dptr + size;
|
||||
+ unsigned char *sptr = (unsigned char *)src;
|
||||
+ unsigned int tmp, c1, c2, c3, c4;
|
||||
+
|
||||
+ do {
|
||||
+ BF_safe_atoi64(c1, *sptr++);
|
||||
+ BF_safe_atoi64(c2, *sptr++);
|
||||
+ *dptr++ = (c1 << 2) | ((c2 & 0x30) >> 4);
|
||||
+ if (dptr >= end) break;
|
||||
+
|
||||
+ BF_safe_atoi64(c3, *sptr++);
|
||||
+ *dptr++ = ((c2 & 0x0F) << 4) | ((c3 & 0x3C) >> 2);
|
||||
+ if (dptr >= end) break;
|
||||
+
|
||||
+ BF_safe_atoi64(c4, *sptr++);
|
||||
+ *dptr++ = ((c3 & 0x03) << 6) | c4;
|
||||
+ } while (dptr < end);
|
||||
+
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
+static void BF_encode(char *dst, __CONST BF_word *src, int size)
|
||||
+{
|
||||
+ unsigned char *sptr = (unsigned char *)src;
|
||||
+ unsigned char *end = sptr + size;
|
||||
+ unsigned char *dptr = (unsigned char *)dst;
|
||||
+ unsigned int c1, c2;
|
||||
+
|
||||
+ do {
|
||||
+ c1 = *sptr++;
|
||||
+ *dptr++ = BF_itoa64[c1 >> 2];
|
||||
+ c1 = (c1 & 0x03) << 4;
|
||||
+ if (sptr >= end) {
|
||||
+ *dptr++ = BF_itoa64[c1];
|
||||
+ break;
|
||||
+ }
|
||||
+
|
||||
+ c2 = *sptr++;
|
||||
+ c1 |= c2 >> 4;
|
||||
+ *dptr++ = BF_itoa64[c1];
|
||||
+ c1 = (c2 & 0x0f) << 2;
|
||||
+ if (sptr >= end) {
|
||||
+ *dptr++ = BF_itoa64[c1];
|
||||
+ break;
|
||||
+ }
|
||||
+
|
||||
+ c2 = *sptr++;
|
||||
+ c1 |= c2 >> 6;
|
||||
+ *dptr++ = BF_itoa64[c1];
|
||||
+ *dptr++ = BF_itoa64[c2 & 0x3f];
|
||||
+ } while (sptr < end);
|
||||
+}
|
||||
+
|
||||
+static void BF_swap(BF_word *x, int count)
|
||||
+{
|
||||
+ static int endianness_check = 1;
|
||||
+ char *is_little_endian = (char *)&endianness_check;
|
||||
+ BF_word tmp;
|
||||
+
|
||||
+ if (*is_little_endian)
|
||||
+ do {
|
||||
+ tmp = *x;
|
||||
+ tmp = (tmp << 16) | (tmp >> 16);
|
||||
+ *x++ = ((tmp & 0x00FF00FF) << 8) | ((tmp >> 8) & 0x00FF00FF);
|
||||
+ } while (--count);
|
||||
+}
|
||||
+
|
||||
+#if BF_SCALE
|
||||
+/* Architectures which can shift addresses left by 2 bits with no extra cost */
|
||||
+#define BF_ROUND(L, R, N) \
|
||||
+ tmp1 = L & 0xFF; \
|
||||
+ tmp2 = L >> 8; \
|
||||
+ tmp2 &= 0xFF; \
|
||||
+ tmp3 = L >> 16; \
|
||||
+ tmp3 &= 0xFF; \
|
||||
+ tmp4 = L >> 24; \
|
||||
+ tmp1 = data.ctx.S[3][tmp1]; \
|
||||
+ tmp2 = data.ctx.S[2][tmp2]; \
|
||||
+ tmp3 = data.ctx.S[1][tmp3]; \
|
||||
+ tmp3 += data.ctx.S[0][tmp4]; \
|
||||
+ tmp3 ^= tmp2; \
|
||||
+ R ^= data.ctx.P[N + 1]; \
|
||||
+ tmp3 += tmp1; \
|
||||
+ R ^= tmp3;
|
||||
+#else
|
||||
+/* Architectures with no complicated addressing modes supported */
|
||||
+#define BF_INDEX(S, i) \
|
||||
+ (*((BF_word *)(((unsigned char *)S) + (i))))
|
||||
+#define BF_ROUND(L, R, N) \
|
||||
+ tmp1 = L & 0xFF; \
|
||||
+ tmp1 <<= 2; \
|
||||
+ tmp2 = L >> 6; \
|
||||
+ tmp2 &= 0x3FC; \
|
||||
+ tmp3 = L >> 14; \
|
||||
+ tmp3 &= 0x3FC; \
|
||||
+ tmp4 = L >> 22; \
|
||||
+ tmp4 &= 0x3FC; \
|
||||
+ tmp1 = BF_INDEX(data.ctx.S[3], tmp1); \
|
||||
+ tmp2 = BF_INDEX(data.ctx.S[2], tmp2); \
|
||||
+ tmp3 = BF_INDEX(data.ctx.S[1], tmp3); \
|
||||
+ tmp3 += BF_INDEX(data.ctx.S[0], tmp4); \
|
||||
+ tmp3 ^= tmp2; \
|
||||
+ R ^= data.ctx.P[N + 1]; \
|
||||
+ tmp3 += tmp1; \
|
||||
+ R ^= tmp3;
|
||||
+#endif
|
||||
+
|
||||
+/*
|
||||
+ * Encrypt one block, BF_N is hardcoded here.
|
||||
+ */
|
||||
+#define BF_ENCRYPT \
|
||||
+ L ^= data.ctx.P[0]; \
|
||||
+ BF_ROUND(L, R, 0); \
|
||||
+ BF_ROUND(R, L, 1); \
|
||||
+ BF_ROUND(L, R, 2); \
|
||||
+ BF_ROUND(R, L, 3); \
|
||||
+ BF_ROUND(L, R, 4); \
|
||||
+ BF_ROUND(R, L, 5); \
|
||||
+ BF_ROUND(L, R, 6); \
|
||||
+ BF_ROUND(R, L, 7); \
|
||||
+ BF_ROUND(L, R, 8); \
|
||||
+ BF_ROUND(R, L, 9); \
|
||||
+ BF_ROUND(L, R, 10); \
|
||||
+ BF_ROUND(R, L, 11); \
|
||||
+ BF_ROUND(L, R, 12); \
|
||||
+ BF_ROUND(R, L, 13); \
|
||||
+ BF_ROUND(L, R, 14); \
|
||||
+ BF_ROUND(R, L, 15); \
|
||||
+ tmp4 = R; \
|
||||
+ R = L; \
|
||||
+ L = tmp4 ^ data.ctx.P[BF_N + 1];
|
||||
+
|
||||
+#if BF_ASM
|
||||
+#define BF_body() \
|
||||
+ _BF_body_r(&data.ctx);
|
||||
+#else
|
||||
+#define BF_body() \
|
||||
+ L = R = 0; \
|
||||
+ ptr = data.ctx.P; \
|
||||
+ do { \
|
||||
+ ptr += 2; \
|
||||
+ BF_ENCRYPT; \
|
||||
+ *(ptr - 2) = L; \
|
||||
+ *(ptr - 1) = R; \
|
||||
+ } while (ptr < &data.ctx.P[BF_N + 2]); \
|
||||
+\
|
||||
+ ptr = data.ctx.S[0]; \
|
||||
+ do { \
|
||||
+ ptr += 2; \
|
||||
+ BF_ENCRYPT; \
|
||||
+ *(ptr - 2) = L; \
|
||||
+ *(ptr - 1) = R; \
|
||||
+ } while (ptr < &data.ctx.S[3][0xFF]);
|
||||
+#endif
|
||||
+
|
||||
+static void BF_set_key(__CONST char *key, BF_key expanded, BF_key initial)
|
||||
+{
|
||||
+ __CONST char *ptr = key;
|
||||
+ int i, j;
|
||||
+ BF_word tmp;
|
||||
+
|
||||
+ for (i = 0; i < BF_N + 2; i++) {
|
||||
+ tmp = 0;
|
||||
+ for (j = 0; j < 4; j++) {
|
||||
+ tmp <<= 8;
|
||||
+ tmp |= (unsigned char)*ptr;
|
||||
+
|
||||
+ if (!*ptr) ptr = key; else ptr++;
|
||||
+ }
|
||||
+
|
||||
+ expanded[i] = tmp;
|
||||
+ initial[i] = BF_init_state.P[i] ^ tmp;
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
+char *_crypt_blowfish_rn(__CONST char *key, __CONST char *setting,
|
||||
+ char *output, int size)
|
||||
+{
|
||||
+#if BF_ASM
|
||||
+ extern void _BF_body_r(BF_ctx *ctx);
|
||||
+#endif
|
||||
+ struct {
|
||||
+ BF_ctx ctx;
|
||||
+ BF_key expanded_key;
|
||||
+ union {
|
||||
+ BF_word salt[4];
|
||||
+ BF_word output[6];
|
||||
+ } binary;
|
||||
+ } data;
|
||||
+ BF_word L, R;
|
||||
+ BF_word tmp1, tmp2, tmp3, tmp4;
|
||||
+ BF_word *ptr;
|
||||
+ BF_word count;
|
||||
+ int i;
|
||||
+
|
||||
+ if (size < 7 + 22 + 31 + 1) {
|
||||
+ __set_errno(ERANGE);
|
||||
+ return NULL;
|
||||
+ }
|
||||
+
|
||||
+ if (setting[0] != '$' ||
|
||||
+ setting[1] != '2' ||
|
||||
+ setting[2] != 'a' ||
|
||||
+ setting[3] != '$' ||
|
||||
+ setting[4] < '0' || setting[4] > '3' ||
|
||||
+ setting[5] < '0' || setting[5] > '9' ||
|
||||
+ setting[6] != '$') {
|
||||
+ __set_errno(EINVAL);
|
||||
+ return NULL;
|
||||
+ }
|
||||
+
|
||||
+ count = (BF_word)1 << ((setting[4] - '0') * 10 + (setting[5] - '0'));
|
||||
+ if (count < 16 || BF_decode(data.binary.salt, &setting[7], 16)) {
|
||||
+ clean(data.binary.salt, sizeof(data.binary.salt));
|
||||
+ __set_errno(EINVAL);
|
||||
+ return NULL;
|
||||
+ }
|
||||
+ BF_swap(data.binary.salt, 4);
|
||||
+
|
||||
+ BF_set_key(key, data.expanded_key, data.ctx.P);
|
||||
+
|
||||
+ memcpy(data.ctx.S, BF_init_state.S, sizeof(data.ctx.S));
|
||||
+
|
||||
+ L = R = 0;
|
||||
+ for (i = 0; i < BF_N + 2; i += 2) {
|
||||
+ L ^= data.binary.salt[i & 2];
|
||||
+ R ^= data.binary.salt[(i & 2) + 1];
|
||||
+ BF_ENCRYPT;
|
||||
+ data.ctx.P[i] = L;
|
||||
+ data.ctx.P[i + 1] = R;
|
||||
+ }
|
||||
+
|
||||
+ ptr = data.ctx.S[0];
|
||||
+ do {
|
||||
+ ptr += 4;
|
||||
+ L ^= data.binary.salt[(BF_N + 2) & 3];
|
||||
+ R ^= data.binary.salt[(BF_N + 3) & 3];
|
||||
+ BF_ENCRYPT;
|
||||
+ *(ptr - 4) = L;
|
||||
+ *(ptr - 3) = R;
|
||||
+
|
||||
+ L ^= data.binary.salt[(BF_N + 4) & 3];
|
||||
+ R ^= data.binary.salt[(BF_N + 5) & 3];
|
||||
+ BF_ENCRYPT;
|
||||
+ *(ptr - 2) = L;
|
||||
+ *(ptr - 1) = R;
|
||||
+ } while (ptr < &data.ctx.S[3][0xFF]);
|
||||
+
|
||||
+ do {
|
||||
+ data.ctx.P[0] ^= data.expanded_key[0];
|
||||
+ data.ctx.P[1] ^= data.expanded_key[1];
|
||||
+ data.ctx.P[2] ^= data.expanded_key[2];
|
||||
+ data.ctx.P[3] ^= data.expanded_key[3];
|
||||
+ data.ctx.P[4] ^= data.expanded_key[4];
|
||||
+ data.ctx.P[5] ^= data.expanded_key[5];
|
||||
+ data.ctx.P[6] ^= data.expanded_key[6];
|
||||
+ data.ctx.P[7] ^= data.expanded_key[7];
|
||||
+ data.ctx.P[8] ^= data.expanded_key[8];
|
||||
+ data.ctx.P[9] ^= data.expanded_key[9];
|
||||
+ data.ctx.P[10] ^= data.expanded_key[10];
|
||||
+ data.ctx.P[11] ^= data.expanded_key[11];
|
||||
+ data.ctx.P[12] ^= data.expanded_key[12];
|
||||
+ data.ctx.P[13] ^= data.expanded_key[13];
|
||||
+ data.ctx.P[14] ^= data.expanded_key[14];
|
||||
+ data.ctx.P[15] ^= data.expanded_key[15];
|
||||
+ data.ctx.P[16] ^= data.expanded_key[16];
|
||||
+ data.ctx.P[17] ^= data.expanded_key[17];
|
||||
+
|
||||
+ BF_body();
|
||||
+
|
||||
+ tmp1 = data.binary.salt[0];
|
||||
+ tmp2 = data.binary.salt[1];
|
||||
+ tmp3 = data.binary.salt[2];
|
||||
+ tmp4 = data.binary.salt[3];
|
||||
+ data.ctx.P[0] ^= tmp1;
|
||||
+ data.ctx.P[1] ^= tmp2;
|
||||
+ data.ctx.P[2] ^= tmp3;
|
||||
+ data.ctx.P[3] ^= tmp4;
|
||||
+ data.ctx.P[4] ^= tmp1;
|
||||
+ data.ctx.P[5] ^= tmp2;
|
||||
+ data.ctx.P[6] ^= tmp3;
|
||||
+ data.ctx.P[7] ^= tmp4;
|
||||
+ data.ctx.P[8] ^= tmp1;
|
||||
+ data.ctx.P[9] ^= tmp2;
|
||||
+ data.ctx.P[10] ^= tmp3;
|
||||
+ data.ctx.P[11] ^= tmp4;
|
||||
+ data.ctx.P[12] ^= tmp1;
|
||||
+ data.ctx.P[13] ^= tmp2;
|
||||
+ data.ctx.P[14] ^= tmp3;
|
||||
+ data.ctx.P[15] ^= tmp4;
|
||||
+ data.ctx.P[16] ^= tmp1;
|
||||
+ data.ctx.P[17] ^= tmp2;
|
||||
+
|
||||
+ BF_body();
|
||||
+ } while (--count);
|
||||
+
|
||||
+ for (i = 0; i < 6; i += 2) {
|
||||
+ L = BF_magic_w[i];
|
||||
+ R = BF_magic_w[i + 1];
|
||||
+
|
||||
+ count = 64;
|
||||
+ do {
|
||||
+ BF_ENCRYPT;
|
||||
+ } while (--count);
|
||||
+
|
||||
+ data.binary.output[i] = L;
|
||||
+ data.binary.output[i + 1] = R;
|
||||
+ }
|
||||
+
|
||||
+ memcpy(output, setting, 7 + 22 - 1);
|
||||
+ output[7 + 22 - 1] = BF_itoa64[(int)
|
||||
+ BF_atoi64[(int)setting[7 + 22 - 1] - 0x20] & 0x30];
|
||||
+
|
||||
+/* This has to be bug-compatible with the original implementation, so
|
||||
+ * only encode 23 of the 24 bytes. :-) */
|
||||
+ BF_swap(data.binary.output, 6);
|
||||
+ BF_encode(&output[7 + 22], data.binary.output, 23);
|
||||
+ output[7 + 22 + 31] = '\0';
|
||||
+
|
||||
+/* Overwrite the most obvious sensitive data we have on the stack. Note
|
||||
+ * that this does not guarantee there's no sensitive data left on the
|
||||
+ * stack and/or in registers; I'm not aware of portable code that does. */
|
||||
+ clean(&data, sizeof(data));
|
||||
+
|
||||
+ return output;
|
||||
+}
|
||||
+
|
||||
+char *_crypt_gensalt_blowfish_rn(unsigned long count,
|
||||
+ __CONST char *input, int size, char *output, int output_size)
|
||||
+{
|
||||
+ if (size < 16 || output_size < 7 + 22 + 1 ||
|
||||
+ (count && (count < 4 || count > 31))) {
|
||||
+ if (output_size > 0) output[0] = '\0';
|
||||
+ __set_errno((output_size < 7 + 22 + 1) ? ERANGE : EINVAL);
|
||||
+ return NULL;
|
||||
+ }
|
||||
+
|
||||
+ if (!count) count = 5;
|
||||
+
|
||||
+ output[0] = '$';
|
||||
+ output[1] = '2';
|
||||
+ output[2] = 'a';
|
||||
+ output[3] = '$';
|
||||
+ output[4] = '0' + count / 10;
|
||||
+ output[5] = '0' + count % 10;
|
||||
+ output[6] = '$';
|
||||
+
|
||||
+ BF_encode(&output[7], (BF_word *)input, 16);
|
||||
+ output[7 + 22] = '\0';
|
||||
+
|
||||
+ return output;
|
||||
+}
|
||||
diff -ru -N glibc-2.17-orig/crypt/crypt-entry.c glibc-2.17/crypt/crypt-entry.c
|
||||
--- glibc-2.17-orig/crypt/crypt-entry.c 2012-12-25 04:02:13.000000000 +0100
|
||||
+++ glibc-2.17/crypt/crypt-entry.c 2013-01-22 23:30:12.342353955 +0100
|
||||
@@ -61,6 +61,8 @@
|
||||
extern char *__sha512_crypt_r (const char *key, const char *salt,
|
||||
char *buffer, int buflen);
|
||||
extern char *__sha512_crypt (const char *key, const char *salt);
|
||||
+extern char *_crypt_blowfish_rn (const char *key, const char *setting,
|
||||
+ char *output, int size);
|
||||
|
||||
/* Define our magic string to mark salt for MD5 encryption
|
||||
replacement. This is meant to be the same as for other MD5 based
|
||||
@@ -73,6 +75,9 @@
|
||||
/* Magic string for SHA512 encryption. */
|
||||
static const char sha512_salt_prefix[] = "$6$";
|
||||
|
||||
+/* Magic string for Blowfish encryption. */
|
||||
+static const char blowfish_salt_prefix[] = "$2a$";
|
||||
+
|
||||
/* For use by the old, non-reentrant routines (crypt/encrypt/setkey) */
|
||||
extern struct crypt_data _ufc_foobar;
|
||||
|
||||
@@ -113,6 +118,11 @@
|
||||
if (strncmp (sha512_salt_prefix, salt, sizeof (sha512_salt_prefix) - 1) == 0)
|
||||
return __sha512_crypt_r (key, salt, (char *) data,
|
||||
sizeof (struct crypt_data));
|
||||
+
|
||||
+ /* Try to find out whether we have to use Blowfish encryption replacement. */
|
||||
+ if (strncmp (blowfish_salt_prefix, salt, sizeof (blowfish_salt_prefix) - 1) == 0)
|
||||
+ return _crypt_blowfish_rn (key, salt, (char *) data,
|
||||
+ sizeof (struct crypt_data));
|
||||
#endif
|
||||
|
||||
/*
|
||||
diff -ru -N glibc-2.17-orig/crypt/Makefile glibc-2.17/crypt/Makefile
|
||||
--- glibc-2.17-orig/crypt/Makefile 2012-12-25 04:02:13.000000000 +0100
|
||||
+++ glibc-2.17/crypt/Makefile 2013-01-22 23:30:12.341353960 +0100
|
||||
@@ -26,7 +26,7 @@
|
||||
extra-libs-others := $(extra-libs)
|
||||
|
||||
libcrypt-routines := crypt-entry md5-crypt sha256-crypt sha512-crypt crypt \
|
||||
- crypt_util
|
||||
+ crypt_util crypt_blowfish
|
||||
|
||||
tests := cert md5c-test sha256c-test sha512c-test badsalttest
|
||||
|
|
@ -1,42 +0,0 @@
|
|||
From adc7e06fb412a2a1ee52f8cb788caf436335b9f3 Mon Sep 17 00:00:00 2001
|
||||
From: Florian Weimer <fweimer@redhat.com>
|
||||
Date: Wed, 14 Jun 2017 08:11:22 +0200
|
||||
Subject: [PATCH] i686: Add missing IS_IN (libc) guards to vectorized strcspn
|
||||
|
||||
Since commit d957c4d3fa48d685ff2726c605c988127ef99395 (i386: Compile
|
||||
rtld-*.os with -mno-sse -mno-mmx -mfpmath=387), vector intrinsics can
|
||||
no longer be used in ld.so, even if the compiled code never makes it
|
||||
into the final ld.so link. This commit adds the missing IS_IN (libc)
|
||||
guard to the SSE 4.2 strcspn implementation, so that it can be used from
|
||||
ld.so in the future.
|
||||
|
||||
(cherry picked from commit 69052a3a95da37169a08f9e59b2cc1808312753c)
|
||||
---
|
||||
ChangeLog | 5 +++++
|
||||
sysdeps/i386/i686/multiarch/strcspn-c.c | 6 ++++--
|
||||
sysdeps/i386/i686/multiarch/varshift.c | 4 +++-
|
||||
3 files changed, 12 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/sysdeps/i386/i686/multiarch/strcspn-c.c b/sysdeps/i386/i686/multiarch/strcspn-c.c
|
||||
index 6d61e19..ec230fb 100644
|
||||
--- a/sysdeps/i386/i686/multiarch/strcspn-c.c
|
||||
+++ b/sysdeps/i386/i686/multiarch/strcspn-c.c
|
||||
@@ -1,2 +1,4 @@
|
||||
-#define __strcspn_sse2 __strcspn_ia32
|
||||
-#include <sysdeps/x86_64/multiarch/strcspn-c.c>
|
||||
+#if IS_IN (libc)
|
||||
+# define __strcspn_sse2 __strcspn_ia32
|
||||
+# include <sysdeps/x86_64/multiarch/strcspn-c.c>
|
||||
+#endif
|
||||
diff --git a/sysdeps/i386/i686/multiarch/varshift.c b/sysdeps/i386/i686/multiarch/varshift.c
|
||||
index 7760b96..6742a35 100644
|
||||
--- a/sysdeps/i386/i686/multiarch/varshift.c
|
||||
+++ b/sysdeps/i386/i686/multiarch/varshift.c
|
||||
@@ -1 +1,3 @@
|
||||
-#include <sysdeps/x86_64/multiarch/varshift.c>
|
||||
+#if IS_IN (libc)
|
||||
+# include <sysdeps/x86_64/multiarch/varshift.c>
|
||||
+#endif
|
||||
--
|
||||
2.9.3
|
||||
|
|
@ -1,11 +1,11 @@
|
|||
{ callPackage, fetchurl, ... } @ args:
|
||||
|
||||
callPackage ./generic.nix (args // rec {
|
||||
version = "3.5.14";
|
||||
version = "3.5.15";
|
||||
|
||||
src = fetchurl {
|
||||
url = "ftp://ftp.gnutls.org/gcrypt/gnutls/v3.5/gnutls-${version}.tar.xz";
|
||||
sha256 = "1nhv0mf3apz65ljh335l8xds7wpn08ywljkrvws08apljbn2v8aa";
|
||||
sha256 = "1mgsxkbs44csw07ngwbqns2y2s03m975lk1sl5ay87wbic882q04";
|
||||
};
|
||||
|
||||
# Skip two tests introduced in 3.5.11. Probable reasons of failure:
|
||||
|
|
|
@ -13,7 +13,7 @@ with stdenv.lib;
|
|||
|
||||
let
|
||||
ver_maj = "3.22";
|
||||
ver_min = "18";
|
||||
ver_min = "19";
|
||||
version = "${ver_maj}.${ver_min}";
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
|
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gtk+/${ver_maj}/gtk+-${version}.tar.xz";
|
||||
sha256 = "b64b1c2ec20adf128ac08ee704d1f4e7b0a8d3df097d51f62edb271c7bb1bf69";
|
||||
sha256 = "9883d3ca5244f9b3168ce660e87d52900e141d0f7147dea0640bdd6fe8e5166c";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
|
|
@ -7,7 +7,7 @@ mkDerivation {
|
|||
|
||||
outputs = [ "out" ]; # this package has no runtime components
|
||||
|
||||
propagatedNativeBuildInputs = [ cmake pkgconfig ];
|
||||
propagatedBuildInputs = [ cmake pkgconfig ];
|
||||
|
||||
setupHook = ./setup-hook.sh;
|
||||
|
||||
|
|
|
@ -1,14 +1,14 @@
|
|||
{ stdenv, fetchurl, fetchpatch, libgpgerror, enableCapabilities ? false, libcap }:
|
||||
{ stdenv, fetchurl, libgpgerror, enableCapabilities ? false, libcap }:
|
||||
|
||||
assert enableCapabilities -> stdenv.isLinux;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "libgcrypt-${version}";
|
||||
version = "1.8.0";
|
||||
version = "1.8.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnupg/libgcrypt/${name}.tar.bz2";
|
||||
sha256 = "06w97l88y2c29zf8p8cg0m4k2kiiyj6pqxdl0cxigi3wp2brdr13";
|
||||
sha256 = "1cvqd9jk5qshbh48yh3ixw4zyr4n5k50r3475rrh20xfn7w7aa3s";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" "info" ];
|
||||
|
@ -22,15 +22,6 @@ stdenv.mkDerivation rec {
|
|||
buildInputs = [ libgpgerror ]
|
||||
++ stdenv.lib.optional enableCapabilities libcap;
|
||||
|
||||
# Shouldn't be needed after 1.8.1
|
||||
patches = if stdenv.isArm && stdenv.system != "armv7l-linux"
|
||||
then fetchpatch {
|
||||
url = "https://git.gnupg.org/cgi-bin/gitweb.cgi?p=libgcrypt.git;a=patch;h=4a7aa30ae9f3ce798dd886c2f2d4164c43027748";
|
||||
name = "arm.patch";
|
||||
sha256 = "1dq9s0xwpbg7s5sghvssmwh4v88x733zm6c8ab3flllq8h7c8fq5";
|
||||
}
|
||||
else null;
|
||||
|
||||
# Make sure libraries are correct for .pc and .la files
|
||||
# Also make sure includes are fixed for callers who don't use libgpgcrypt-config
|
||||
postFixup = ''
|
||||
|
|
|
@ -67,7 +67,7 @@ let
|
|||
in
|
||||
|
||||
let
|
||||
version = "17.1.7";
|
||||
version = "17.1.9";
|
||||
branch = head (splitString "." version);
|
||||
driverLink = "/run/opengl-driver" + optionalString stdenv.isi686 "-32";
|
||||
in
|
||||
|
@ -82,7 +82,7 @@ stdenv.mkDerivation {
|
|||
"ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz"
|
||||
"https://launchpad.net/mesa/trunk/${version}/+download/mesa-${version}.tar.xz"
|
||||
];
|
||||
sha256 = "1xg5v61nvabjk3rx48cwmnwv6zpqdcnkxl8bz82284mifjl75x39";
|
||||
sha256 = "5f51ad94341696097d5df7b838183534478216858ac0fc8de183671a36ffea1a";
|
||||
};
|
||||
|
||||
prePatch = "patchShebangs .";
|
||||
|
|
|
@ -11,7 +11,7 @@
|
|||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = if abiVersion == "5" then "5.9" else "6.0-20170729";
|
||||
version = if abiVersion == "5" then "5.9" else "6.0-20170902";
|
||||
name = "ncurses-${version}";
|
||||
|
||||
src = fetchurl (if abiVersion == "5" then {
|
||||
|
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "0fsn7xis81za62afan0vvm38bvgzg5wfmv1m86flqcj0nj7jjilh";
|
||||
} else {
|
||||
url = "ftp://ftp.invisible-island.net/ncurses/current/${name}.tgz";
|
||||
sha256 = "1cfdpl2gnj8szw28jmzrw47va0yqn16g03ywyzz3bjmaqxxmmwga";
|
||||
sha256 = "1cks4gsz4148jw6wpqia4w5jx7cfxr29g2kmpvp0ssmvwczh8dr4";
|
||||
});
|
||||
|
||||
patches = [ ./clang.patch ] ++ lib.optional (abiVersion == "5" && stdenv.cc.isGNU) ./gcc-5.patch;
|
||||
|
@ -115,6 +115,7 @@ stdenv.mkDerivation rec {
|
|||
moveToOutput "bin/clear" "$out"
|
||||
moveToOutput "bin/reset" "$out"
|
||||
moveToOutput "bin/tabs" "$out"
|
||||
moveToOutput "bin/tic" "$out"
|
||||
moveToOutput "bin/tput" "$out"
|
||||
moveToOutput "bin/tset" "$out"
|
||||
'';
|
||||
|
|
|
@ -17,15 +17,14 @@ let inherit (stdenv.lib) optional; in
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "nghttp2-${version}";
|
||||
version = "1.20.0";
|
||||
version = "1.24.0";
|
||||
|
||||
# Don't use fetchFromGitHub since this needs a bootstrap curl
|
||||
src = fetchurl {
|
||||
url = "https://github.com/nghttp2/nghttp2/releases/download/v${version}/nghttp2-${version}.tar.bz2";
|
||||
sha256 = "fb29d0500b194f11680203aed21aafab241063ec1397cc51ab5cc0957341141b";
|
||||
sha256 = "18ys6p39yvm9wjjzhhlw35c9m8f5gf4dk9jbshibj19q4js1pnv9";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" "lib" ];
|
||||
outputs = [ "bin" "out" "dev" "lib" ];
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
buildInputs = [ openssl libev zlib c-ares ]
|
||||
|
@ -36,12 +35,11 @@ stdenv.mkDerivation rec {
|
|||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
configureFlags = [ "--with-spdylay=no" "--disable-examples" "--disable-python-bindings" ]
|
||||
configureFlags = [ "--with-spdylay=no" "--disable-examples" "--disable-python-bindings" "--enable-app" ]
|
||||
++ optional enableAsioLib "--enable-asio-lib --with-boost-libdir=${boost}/lib";
|
||||
|
||||
#doCheck = true; # requires CUnit ; currently failing at test_util_localtime_date in util_test.cc
|
||||
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = https://nghttp2.org/;
|
||||
description = "A C implementation of HTTP/2";
|
||||
|
|
|
@ -8,6 +8,14 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "091qvwk5dkcpp17ziabcnh3rg3m7qwzw2pihfcd1d5fdxgywzmnd";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchurl {
|
||||
url = "https://bz-attachments.freebsd.org/attachment.cgi?id=183223";
|
||||
sha256 = "1fiy457hrxmydybjlvn8ypzlavz22cz31q2rga07n32dh4x759r3";
|
||||
})
|
||||
];
|
||||
patchFlags = [ "-p0" ];
|
||||
|
||||
# TODO: separate "out" and "bin"
|
||||
outputs = [ "out" "dev" "man" "devdoc" ];
|
||||
|
||||
|
|
|
@ -6,14 +6,14 @@ with stdenv.lib;
|
|||
|
||||
let
|
||||
ver_maj = "1.40";
|
||||
ver_min = "9";
|
||||
ver_min = "11";
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
name = "pango-${ver_maj}.${ver_min}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/pango/${ver_maj}/${name}.tar.xz";
|
||||
sha256 = "9faea6535312fe4436b93047cf7a04af544eb52a079179bd3a33821aacce7e16";
|
||||
sha256 = "5b11140590e632739e4151cae06b8116160d59e22bf36a3ccd5df76d1cf0383e";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
|
|||
};
|
||||
|
||||
glpkWithExtras = lib.overrideDerivation glpk (attrs: {
|
||||
propagatedNativeBuildInputs = [ gmp libtool libmysql libiodbc ];
|
||||
propagatedBuildInputs = [ gmp libtool libmysql libiodbc ];
|
||||
|
||||
CPPFLAGS = "-I${gmp.dev}/include";
|
||||
|
||||
|
@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
|
|||
"--with-gmp=yes" ];
|
||||
});
|
||||
|
||||
buildInputs = [ pkgconfig ];
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
propagatedBuildInputs = [ pure glpkWithExtras ];
|
||||
makeFlags = "libdir=$(out)/lib prefix=$(out)/";
|
||||
setupHook = ../generic-setup-hook.sh;
|
||||
|
|
|
@ -6,26 +6,30 @@
|
|||
, useSharedLibraries ? (!isBootstrap && !stdenv.isCygwin)
|
||||
, useNcurses ? false, ncurses
|
||||
, useQt4 ? false, qt4
|
||||
, withQt5 ? false, qtbase
|
||||
}:
|
||||
|
||||
assert withQt5 -> useQt4 == false;
|
||||
assert useQt4 -> withQt5 == false;
|
||||
|
||||
with stdenv.lib;
|
||||
|
||||
let
|
||||
os = stdenv.lib.optionalString;
|
||||
majorVersion = "3.8";
|
||||
minorVersion = "2";
|
||||
majorVersion = "3.9";
|
||||
minorVersion = "1";
|
||||
version = "${majorVersion}.${minorVersion}";
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "cmake-${os isBootstrap "boot-"}${os useNcurses "cursesUI-"}${os useQt4 "qt4UI-"}${version}";
|
||||
name = "cmake-${os isBootstrap "boot-"}${os useNcurses "cursesUI-"}${os withQt5 "qt5UI-"}${os useQt4 "qt4UI-"}${version}";
|
||||
|
||||
inherit majorVersion;
|
||||
|
||||
src = fetchurl {
|
||||
url = "${meta.homepage}files/v${majorVersion}/cmake-${version}.tar.gz";
|
||||
# from https://cmake.org/files/v3.8/cmake-3.8.2-SHA-256.txt
|
||||
sha256 = "da3072794eb4c09f2d782fcee043847b99bb4cf8d4573978d9b2024214d6e92d";
|
||||
# from https://cmake.org/files/v3.9/cmake-3.9.1-SHA-256.txt
|
||||
sha256 = "d768ee83d217f91bb597b3ca2ac663da7a8603c97e1f1a5184bc01e0ad2b12bb";
|
||||
};
|
||||
|
||||
prePatch = optionalString (!useSharedLibraries) ''
|
||||
|
@ -34,7 +38,7 @@ stdenv.mkDerivation rec {
|
|||
'';
|
||||
|
||||
# Don't search in non-Nix locations such as /usr, but do search in our libc.
|
||||
patches = [ ./search-path-3.2.patch ]
|
||||
patches = [ ./search-path-3.9.patch ]
|
||||
++ optional stdenv.isCygwin ./3.2.2-cygwin.patch;
|
||||
|
||||
outputs = [ "out" ];
|
||||
|
@ -46,7 +50,8 @@ stdenv.mkDerivation rec {
|
|||
[ setupHook pkgconfig ]
|
||||
++ optionals useSharedLibraries [ bzip2 curl expat libarchive xz zlib libuv rhash ]
|
||||
++ optional useNcurses ncurses
|
||||
++ optional useQt4 qt4;
|
||||
++ optional useQt4 qt4
|
||||
++ optional withQt5 qtbase;
|
||||
|
||||
propagatedBuildInputs = optional stdenv.isDarwin ps;
|
||||
|
||||
|
@ -63,7 +68,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
configureFlags = [ "--docdir=share/doc/${name}" ]
|
||||
++ (if useSharedLibraries then [ "--no-system-jsoncpp" "--system-libs" ] else [ "--no-system-libs" ]) # FIXME: cleanup
|
||||
++ optional useQt4 "--qt-gui"
|
||||
++ optional (useQt4 || withQt5) "--qt-gui"
|
||||
++ optionals (!useNcurses) [ "--" "-DBUILD_CursesDialog=OFF" ];
|
||||
|
||||
dontUseCmakeConfigure = true;
|
||||
|
|
|
@ -1,77 +0,0 @@
|
|||
diff -ru3 cmake-3.4.3/Modules/Platform/UnixPaths.cmake cmake-3.4.3-new/Modules/Platform/UnixPaths.cmake
|
||||
--- cmake-3.4.3/Modules/Platform/UnixPaths.cmake 2016-01-25 19:57:19.000000000 +0300
|
||||
+++ cmake-3.4.3-new/Modules/Platform/UnixPaths.cmake 2016-04-14 00:20:08.963492213 +0300
|
||||
@@ -32,9 +32,6 @@
|
||||
# List common installation prefixes. These will be used for all
|
||||
# search types.
|
||||
list(APPEND CMAKE_SYSTEM_PREFIX_PATH
|
||||
- # Standard
|
||||
- /usr/local /usr /
|
||||
-
|
||||
# CMake install location
|
||||
"${_CMAKE_INSTALL_DIR}"
|
||||
)
|
||||
@@ -53,44 +50,25 @@
|
||||
|
||||
# List common include file locations not under the common prefixes.
|
||||
list(APPEND CMAKE_SYSTEM_INCLUDE_PATH
|
||||
- # Windows API on Cygwin
|
||||
- /usr/include/w32api
|
||||
-
|
||||
- # X11
|
||||
- /usr/X11R6/include /usr/include/X11
|
||||
-
|
||||
- # Other
|
||||
- /usr/pkg/include
|
||||
- /opt/csw/include /opt/include
|
||||
- /usr/openwin/include
|
||||
+ @libc_dev@/include
|
||||
)
|
||||
-
|
||||
list(APPEND CMAKE_SYSTEM_LIBRARY_PATH
|
||||
- # Windows API on Cygwin
|
||||
- /usr/lib/w32api
|
||||
-
|
||||
- # X11
|
||||
- /usr/X11R6/lib /usr/lib/X11
|
||||
-
|
||||
- # Other
|
||||
- /usr/pkg/lib
|
||||
- /opt/csw/lib /opt/lib
|
||||
- /usr/openwin/lib
|
||||
+ @libc_lib@/lib
|
||||
)
|
||||
|
||||
list(APPEND CMAKE_SYSTEM_PROGRAM_PATH
|
||||
- /usr/pkg/bin
|
||||
+ @libc_bin@/bin
|
||||
)
|
||||
|
||||
list(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES
|
||||
- /lib /lib32 /lib64 /usr/lib /usr/lib32 /usr/lib64
|
||||
+ @libc_lib@/lib
|
||||
)
|
||||
|
||||
list(APPEND CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES
|
||||
- /usr/include
|
||||
+ @libc_dev@/include
|
||||
)
|
||||
list(APPEND CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES
|
||||
- /usr/include
|
||||
+ @libc_dev@/include
|
||||
)
|
||||
|
||||
# Enable use of lib64 search path variants by default.
|
||||
diff -ur cmake-3.7.2-orig/Modules/Platform/WindowsPaths.cmake cmake-3.7.2/Modules/Platform/WindowsPaths.cmake
|
||||
--- cmake-3.7.2-orig/Modules/Platform/WindowsPaths.cmake 2017-04-26 09:08:39.095674666 -0700
|
||||
+++ cmake-3.7.2/Modules/Platform/WindowsPaths.cmake 2017-04-28 22:32:10.379015998 -0700
|
||||
@@ -66,7 +66,7 @@
|
||||
|
||||
if(CMAKE_CROSSCOMPILING AND NOT CMAKE_HOST_SYSTEM_NAME MATCHES "Windows")
|
||||
# MinGW (useful when cross compiling from linux with CMAKE_FIND_ROOT_PATH set)
|
||||
- list(APPEND CMAKE_SYSTEM_PREFIX_PATH /)
|
||||
+ # list(APPEND CMAKE_SYSTEM_PREFIX_PATH /)
|
||||
endif()
|
||||
|
||||
list(APPEND CMAKE_SYSTEM_INCLUDE_PATH
|
||||
diff -ur cmake-3.7.2-orig/Source/cmFindPackageCommand.cxx cmake-3.7.2/Source/cmFindPackageCommand.cxx
|
|
@ -0,0 +1,62 @@
|
|||
diff -ur cmake-3.9.1/Modules/Platform/UnixPaths.cmake cmake-3.9.1-mod/Modules/Platform/UnixPaths.cmake
|
||||
--- cmake-3.9.1/Modules/Platform/UnixPaths.cmake 2017-08-10 13:36:32.000000000 +0000
|
||||
+++ cmake-3.9.1-mod/Modules/Platform/UnixPaths.cmake 2017-09-03 01:24:31.901473539 +0000
|
||||
@@ -22,9 +22,6 @@
|
||||
# List common installation prefixes. These will be used for all
|
||||
# search types.
|
||||
list(APPEND CMAKE_SYSTEM_PREFIX_PATH
|
||||
- # Standard
|
||||
- /usr/local /usr /
|
||||
-
|
||||
# CMake install location
|
||||
"${_CMAKE_INSTALL_DIR}"
|
||||
)
|
||||
@@ -43,31 +40,26 @@
|
||||
|
||||
# Non "standard" but common install prefixes
|
||||
list(APPEND CMAKE_SYSTEM_PREFIX_PATH
|
||||
- /usr/X11R6
|
||||
- /usr/pkg
|
||||
- /opt
|
||||
)
|
||||
|
||||
# List common include file locations not under the common prefixes.
|
||||
list(APPEND CMAKE_SYSTEM_INCLUDE_PATH
|
||||
- # X11
|
||||
- /usr/include/X11
|
||||
+ @libc_dev@/include
|
||||
)
|
||||
|
||||
list(APPEND CMAKE_SYSTEM_LIBRARY_PATH
|
||||
- # X11
|
||||
- /usr/lib/X11
|
||||
+ @libc_lib@/lib
|
||||
)
|
||||
|
||||
list(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES
|
||||
- /lib /lib32 /lib64 /usr/lib /usr/lib32 /usr/lib64
|
||||
+ @libc_lib@/lib
|
||||
)
|
||||
|
||||
list(APPEND CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES
|
||||
- /usr/include
|
||||
+ @libc_dev@/include
|
||||
)
|
||||
list(APPEND CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES
|
||||
- /usr/include
|
||||
+ @libc_dev@/include
|
||||
)
|
||||
|
||||
# Enable use of lib32 and lib64 search path variants by default.
|
||||
diff -ur cmake-3.9.1/Modules/Platform/WindowsPaths.cmake cmake-3.9.1-mod/Modules/Platform/WindowsPaths.cmake
|
||||
--- cmake-3.9.1/Modules/Platform/WindowsPaths.cmake 2017-08-10 13:36:32.000000000 +0000
|
||||
+++ cmake-3.9.1-mod/Modules/Platform/WindowsPaths.cmake 2017-09-03 01:19:32.808355986 +0000
|
||||
@@ -66,7 +66,7 @@
|
||||
|
||||
if(CMAKE_CROSSCOMPILING AND NOT CMAKE_HOST_SYSTEM_NAME MATCHES "Windows")
|
||||
# MinGW (useful when cross compiling from linux with CMAKE_FIND_ROOT_PATH set)
|
||||
- list(APPEND CMAKE_SYSTEM_PREFIX_PATH /)
|
||||
+ # list(APPEND CMAKE_SYSTEM_PREFIX_PATH /)
|
||||
endif()
|
||||
|
||||
list(APPEND CMAKE_SYSTEM_INCLUDE_PATH
|
|
@ -8,7 +8,8 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "07krzl4czczdsgzrrw9fiqx35xcf32naf751khg821g5pqv12qgh";
|
||||
};
|
||||
|
||||
buildInputs = [m4 perl lzma];
|
||||
nativebuildInputs = [ lzma ];
|
||||
buildInputs = [ m4 perl ];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
|
|
|
@ -8,7 +8,8 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "0lvp4306f5nq08f3snffs5pp1zwv8l35z6f5g0dds51zs6bzdv6l";
|
||||
};
|
||||
|
||||
buildInputs = [ makeWrapper perl gettext LocaleGettext ];
|
||||
nativeBuildInputs = [ makeWrapper gettext LocaleGettext ];
|
||||
buildInputs = [ perl LocaleGettext ];
|
||||
|
||||
doCheck = false; # target `check' is missing
|
||||
|
||||
|
|
|
@ -12,8 +12,8 @@ stdenv.mkDerivation rec {
|
|||
|
||||
outputs = [ "out" "lib" ];
|
||||
|
||||
propagatedNativeBuildInputs = [ m4 ];
|
||||
nativeBuildInputs = [ perl help2man ];
|
||||
propagatedBuildInputs = [ m4 ];
|
||||
|
||||
# Don't fixup "#! /bin/sh" in Libtool, otherwise it will use the
|
||||
# "fixed" path in generated files!
|
||||
|
|
|
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
nativeBuildInputs = [ flex bison texinfo help2man autoreconfHook ];
|
||||
|
||||
propagatedNativeBuildInputs = [ m4 ];
|
||||
propagatedBuildInputs = [ m4 ];
|
||||
|
||||
crossAttrs = {
|
||||
preConfigure = ''
|
||||
|
|
|
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
buildInputs = [ bison ];
|
||||
|
||||
propagatedNativeBuildInputs = [ m4 ];
|
||||
propagatedBuildInputs = [ m4 ];
|
||||
|
||||
postConfigure = stdenv.lib.optionalString (stdenv.isDarwin || stdenv.isCygwin) ''
|
||||
sed -i Makefile -e 's/-no-undefined//;'
|
||||
|
|
|
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
buildInputs = [ bison ];
|
||||
|
||||
propagatedNativeBuildInputs = [ m4 ];
|
||||
propagatedBuildInputs = [ m4 ];
|
||||
|
||||
postConfigure = stdenv.lib.optionalString (stdenv.isDarwin || stdenv.isCygwin) ''
|
||||
sed -i Makefile -e 's/-no-undefined//;'
|
||||
|
|
|
@ -62,11 +62,7 @@
|
|||
, cleanupCmds ? "", shell ? "${pkgs.bashInteractive}/bin/bash --norc"}:
|
||||
|
||||
mkDerivation {
|
||||
# The setup.sh script from stdenv will expect the native build inputs in
|
||||
# the nativeBuildInputs environment variable.
|
||||
nativeBuildInputs = [ ] ++ buildInputs;
|
||||
# Trick to bypass the stdenv usual change of propagatedBuildInputs => propagatedNativeBuildInputs
|
||||
propagatedBuildInputs2 = propagatedBuildInputs;
|
||||
inherit buildInputs propagatedBuildInputs;
|
||||
|
||||
name = "env-${name}";
|
||||
phases = [ "buildPhase" "fixupPhase" ];
|
||||
|
@ -89,8 +85,8 @@ mkDerivation {
|
|||
"$setupNew" > "$s"
|
||||
cat >> "$out/dev-envs/''${name/env-/}" << EOF
|
||||
defaultNativeBuildInputs="$defaultNativeBuildInputs"
|
||||
nativeBuildInputs="$nativeBuildInputs"
|
||||
propagatedBuildInputs="$propagatedBuildInputs2"
|
||||
buildInputs="$buildInputs"
|
||||
propagatedBuildInputs="$propagatedBuildInputs"
|
||||
# the setup-new script wants to write some data to a temp file.. so just let it do that and tidy up afterwards
|
||||
tmp="\$("${pkgs.coreutils}/bin/mktemp" -d)"
|
||||
NIX_BUILD_TOP="\$tmp"
|
||||
|
|
|
@ -134,7 +134,7 @@ let
|
|||
propagatedBuildInputs = deps;
|
||||
|
||||
# don't use pure CF for dylibs that depend on frameworks
|
||||
setupHook = ../../../build-support/setup-hooks/fix-darwin-frameworks.sh;
|
||||
setupHook = ./framework-setup-hook.sh;
|
||||
|
||||
# allows building the symlink tree
|
||||
__impureHostDeps = [ "/System/Library/Frameworks/${name}.framework" ];
|
||||
|
|
|
@ -29,3 +29,14 @@ fixDarwinFrameworksIn() {
|
|||
local dir="$1"
|
||||
fixDarwinFrameworks $(find "$dir" -name "*.dylib")
|
||||
}
|
||||
|
||||
|
||||
# This configures the stdenv to use /System/Library/Frameworks/CoreFoundation.framework
|
||||
# instead of the nix version by including the system frameworks path
|
||||
# as an rpath entry when creating binaries.
|
||||
|
||||
useSystemCoreFoundationFramework () {
|
||||
export NIX_COREFOUNDATION_RPATH=/System/Library/Frameworks
|
||||
}
|
||||
|
||||
envHooks+=(useSystemCoreFoundationFramework)
|
|
@ -18,7 +18,7 @@ appleDerivation {
|
|||
--replace "/usr/sbin/" "" \
|
||||
--replace "/bin/" "" \
|
||||
--replace "INSTALLNAME=/System" "INSTALLNAME=$out" \
|
||||
--replace "install_name_tool -id /System" "install_name_tool -id $out" \
|
||||
--replace "install_name_tool -id /System/Library/Frameworks" "install_name_tool -id @rpath" \
|
||||
--replace 'chown -RH -f root:wheel $(DSTBASE)/CoreFoundation.framework' "" \
|
||||
--replace 'chmod -RH' 'chmod -R'
|
||||
|
||||
|
|
|
@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "1pv3vs2w4l2wnw5qb0rkbpvjjdd1fwjv87miavqq0r0ynqbfajwx";
|
||||
};
|
||||
|
||||
hardeningDisable = [ "format" ] ++ lib.optional enableStatic [ "fortify" ];
|
||||
hardeningDisable = [ "format" ] ++ lib.optionals enableStatic [ "fortify" ];
|
||||
|
||||
patches = [ ./busybox-in-store.patch ];
|
||||
|
||||
|
|
|
@ -8,8 +8,9 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "14f1k7v6i1yaxg4xcaaf5i4aqn0yabba857zjnbg9wiymy82qf7c";
|
||||
};
|
||||
|
||||
hardeningDisable = [ "format" ]; # fix compile error
|
||||
|
||||
buildCommand = ''
|
||||
export hardeningDisable=format # fix compile error
|
||||
cc "$src" -o devmem2
|
||||
install -D devmem2 "$out/bin/devmem2"
|
||||
'';
|
||||
|
|
|
@ -17,7 +17,7 @@ let version = "8"; in
|
|||
buildInputs = [ gnu-efi libsmbios popt pkgconfig gettext ];
|
||||
propagatedBuildInputs = [ efivar ];
|
||||
# TODO: Just apply the disable to the efi subdir
|
||||
hardeningDisable = "all";
|
||||
hardeningDisable = [ "all" ];
|
||||
patchPhase = ''
|
||||
sed -i 's|/usr/include/smbios_c/token.h|smbios_c/token.h|' \
|
||||
linux/libfwup.c
|
||||
|
|
|
@ -73,6 +73,15 @@ stdenv.mkDerivation rec {
|
|||
|
||||
hardeningDisable = [ "stackprotector" ];
|
||||
|
||||
patches = [
|
||||
# TODO: Remove this patch when we have a systemd version
|
||||
# with https://github.com/systemd/systemd/pull/6678
|
||||
(fetchpatch {
|
||||
url = "https://github.com/systemd/systemd/commit/58a78ae77063eddfcd23ea272bd2e0ddc9ea3ff7.patch";
|
||||
sha256 = "0g3pvqigs69mciw6lj3zg12dmxnhwxndwxdjg78af52xrp0djfg8";
|
||||
})
|
||||
];
|
||||
|
||||
preConfigure =
|
||||
''
|
||||
unset RANLIB
|
||||
|
|
|
@ -76,7 +76,7 @@ stdenv.mkDerivation rec {
|
|||
];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = http://freeradius.org/;
|
||||
homepage = https://freeradius.org/;
|
||||
description = "A modular, high performance free RADIUS suite";
|
||||
license = licenses.gpl2;
|
||||
maintainers = with maintainers; [ sheenobu willibutz ];
|
||||
|
|
|
@ -19,11 +19,11 @@ with lib;
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "samba-${version}";
|
||||
version = "4.6.4";
|
||||
version = "4.6.7";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://samba/pub/samba/stable/${name}.tar.gz";
|
||||
sha256 = "0qcsinhcq3frlqp7bfav5mdc9xn1h4xy4l6vfpf8cmcfs4lp7ija";
|
||||
sha256 = "1ynxndfk45zkkylz3jsrx42a7kmm42jddk5bdhihyf88vs9l7wly";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" "man" ];
|
||||
|
|
|
@ -6,7 +6,7 @@ with stdenv.lib;
|
|||
overrideDerivation xorgserver (oldAttrs: {
|
||||
|
||||
name = "xwayland-${xorgserver.version}";
|
||||
propagatedNativeBuildInputs = oldAttrs.propagatedNativeBuildInputs
|
||||
propagatedBuildInputs = oldAttrs.propagatedBuildInputs
|
||||
++ [wayland wayland-protocols epoxy libxslt makeWrapper libunwind];
|
||||
configureFlags = [
|
||||
"--disable-docs"
|
||||
|
|
|
@ -79,15 +79,17 @@ in rec {
|
|||
inherit shell;
|
||||
inherit (last) stdenv;
|
||||
|
||||
nativeTools = true;
|
||||
nativePrefix = bootstrapTools;
|
||||
nativeTools = false;
|
||||
nativeLibc = false;
|
||||
buildPackages = lib.optionalAttrs (last ? stdenv) {
|
||||
inherit (last) stdenv;
|
||||
};
|
||||
libc = last.pkgs.darwin.Libsystem;
|
||||
isClang = true;
|
||||
cc = { name = "clang-9.9.9"; outPath = bootstrapTools; };
|
||||
cc = { name = "clang-9.9.9"; outPath = bootstrapTools; };
|
||||
binutils = { name = "binutils-9.9.9"; outPath = bootstrapTools; };
|
||||
coreutils = { name = "coreutils-9.9.9"; outPath = bootstrapTools; };
|
||||
gnugrep = { name = "gnugrep-9.9.9"; outPath = bootstrapTools; };
|
||||
};
|
||||
|
||||
preHook = stage0.stdenv.lib.optionalString (shell == "${bootstrapTools}/bin/bash") ''
|
||||
|
@ -267,7 +269,16 @@ in rec {
|
|||
extraPreHook = ''
|
||||
export PATH_LOCALE=${pkgs.darwin.locale}/share/locale
|
||||
'';
|
||||
overrides = persistent;
|
||||
overrides = self: super: (persistent self super) // {
|
||||
# Hack to make sure we don't link ncurses in bootstrap tools. The proper
|
||||
# solution is to avoid passing -L/nix-store/...-bootstrap-tools/lib,
|
||||
# quite a sledgehammer just to get the C runtime.
|
||||
gettext = super.gettext.overrideAttrs (old: {
|
||||
configureFlags = old.configureFlags ++ [
|
||||
"--disable-curses"
|
||||
];
|
||||
});
|
||||
};
|
||||
};
|
||||
|
||||
stdenvDarwin = prevStage: let
|
||||
|
@ -300,6 +311,7 @@ in rec {
|
|||
targetPlatform = localSystem;
|
||||
|
||||
preHook = commonPreHook + ''
|
||||
export NIX_COREFOUNDATION_RPATH=${pkgs.darwin.CF}/Library/Frameworks
|
||||
export PATH_LOCALE=${pkgs.darwin.locale}/share/locale
|
||||
'';
|
||||
|
||||
|
|
|
@ -41,8 +41,21 @@ rec {
|
|||
, __propagatedImpureHostDeps ? []
|
||||
, sandboxProfile ? ""
|
||||
, propagatedSandboxProfile ? ""
|
||||
|
||||
, hardeningEnable ? []
|
||||
, hardeningDisable ? []
|
||||
, ... } @ attrs:
|
||||
|
||||
# TODO(@Ericson2314): Make this more modular, and not O(n^2).
|
||||
let
|
||||
supportedHardeningFlags = [ "fortify" "stackprotector" "pie" "pic" "strictoverflow" "format" "relro" "bindnow" ];
|
||||
# hardeningDisable additionally supports "all".
|
||||
erroneousHardeningFlags = lib.subtractLists supportedHardeningFlags (hardeningEnable ++ lib.remove "all" hardeningDisable);
|
||||
in if builtins.length erroneousHardeningFlags != 0
|
||||
then abort ("mkDerivation was called with unsupported hardening flags: " + lib.generators.toPretty {} {
|
||||
inherit erroneousHardeningFlags hardeningDisable hardeningEnable supportedHardeningFlags;
|
||||
})
|
||||
else let
|
||||
dependencies = map lib.chooseDevOutputs [
|
||||
(map (drv: drv.nativeDrv or drv) nativeBuildInputs
|
||||
++ lib.optional separateDebugInfo ../../build-support/setup-hooks/separate-debug-info.sh
|
||||
|
|
|
@ -473,14 +473,14 @@ substitute() {
|
|||
shift 2
|
||||
|
||||
if [ ! -f "$input" ]; then
|
||||
echo "${FUNCNAME[0]}(): ERROR: file '$input' does not exist" >&2
|
||||
echo "substitute(): ERROR: file '$input' does not exist" >&2
|
||||
return 1
|
||||
fi
|
||||
|
||||
local content
|
||||
# read returns non-0 on EOF, so we want read to fail
|
||||
if IFS='' read -r -N 0 content < "$input"; then
|
||||
echo "${FUNCNAME[0]}(): ERROR: File \"$input\" has null bytes, won't process" >&2
|
||||
echo "substitute(): ERROR: File \"$input\" has null bytes, won't process" >&2
|
||||
return 1
|
||||
fi
|
||||
|
||||
|
@ -497,10 +497,8 @@ substitute() {
|
|||
shift 2
|
||||
# check if the used nix attribute name is a valid bash name
|
||||
if ! [[ "$varName" =~ ^[a-zA-Z_][a-zA-Z0-9_]*$ ]]; then
|
||||
echo "${FUNCNAME[0]}(): WARNING: substitution variables should be valid bash names," >&2
|
||||
echo " \"$varName\" isn't and therefore was skipped; it might be caused" >&2
|
||||
echo " by multi-line phases in variables - see #14907 for details." >&2
|
||||
continue
|
||||
echo "substitute(): ERROR: substitution variables must be valid Bash names, \"$varName\" isn't." >&2
|
||||
return 1
|
||||
fi
|
||||
pattern="@$varName@"
|
||||
replacement="${!varName}"
|
||||
|
@ -513,7 +511,7 @@ substitute() {
|
|||
;;
|
||||
|
||||
*)
|
||||
echo "${FUNCNAME[0]}(): ERROR: Invalid command line argument: $1" >&2
|
||||
echo "substitute(): ERROR: Invalid command line argument: $1" >&2
|
||||
return 1
|
||||
;;
|
||||
esac
|
||||
|
@ -533,18 +531,16 @@ substituteInPlace() {
|
|||
}
|
||||
|
||||
|
||||
# Substitute all environment variables that do not start with an upper-case
|
||||
# character or underscore. Note: other names that aren't bash-valid
|
||||
# will cause an error during `substitute --subst-var`.
|
||||
# Substitute all environment variables that start with a lowercase character and
|
||||
# are valid Bash names.
|
||||
substituteAll() {
|
||||
local input="$1"
|
||||
local output="$2"
|
||||
local -a args=()
|
||||
|
||||
# Select all environment variables that start with a lowercase character.
|
||||
for varName in $(env | sed -e $'s/^\([a-z][^= \t]*\)=.*/\\1/; t \n d'); do
|
||||
for varName in $(awk 'BEGIN { for (v in ENVIRON) if (v ~ /^[a-z][a-zA-Z0-9_]*$/) print v }'); do
|
||||
if [ "${NIX_DEBUG:-}" = "1" ]; then
|
||||
echo "@${varName}@ -> '${!varName}'"
|
||||
printf "@%s@ -> %q\n" "${varName}" "${!varName}"
|
||||
fi
|
||||
args+=("--subst-var" "$varName")
|
||||
done
|
||||
|
@ -1020,9 +1016,8 @@ genericBuild() {
|
|||
if [[ "$curPhase" = installCheckPhase && -z "${doInstallCheck:-}" ]]; then continue; fi
|
||||
if [[ "$curPhase" = distPhase && -z "${doDist:-}" ]]; then continue; fi
|
||||
|
||||
if [[ -n "${tracePhases:-}" ]]; then
|
||||
echo
|
||||
echo "@ phase-started $out $curPhase"
|
||||
if [[ -n $NIX_LOG_FD ]]; then
|
||||
echo "@nix { \"action\": \"setPhase\", \"phase\": \"$curPhase\" }" >&$NIX_LOG_FD
|
||||
fi
|
||||
|
||||
showPhaseHeader "$curPhase"
|
||||
|
@ -1038,11 +1033,6 @@ genericBuild() {
|
|||
if [ "$curPhase" = unpackPhase ]; then
|
||||
cd "${sourceRoot:-.}"
|
||||
fi
|
||||
|
||||
if [ -n "${tracePhases:-}" ]; then
|
||||
echo
|
||||
echo "@ phase-succeeded $out $curPhase"
|
||||
fi
|
||||
done
|
||||
}
|
||||
|
||||
|
|
|
@ -177,9 +177,9 @@ rec {
|
|||
|
||||
# Copy binutils.
|
||||
for i in as ld ar ranlib nm strip readelf objdump; do
|
||||
cp ${binutils.out}/bin/$i $out/bin
|
||||
cp ${binutils.binutils.out}/bin/$i $out/bin
|
||||
done
|
||||
cp -d ${binutils.lib}/lib/lib*.so* $out/lib
|
||||
cp -d ${binutils.binutils.lib}/lib/lib*.so* $out/lib
|
||||
|
||||
chmod -R u+w $out
|
||||
|
||||
|
|
|
@ -89,7 +89,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
nativeBuildInputs = [ cmake zlib gettext libtool ] ++ xorg.xorgserver.nativeBuildInputs;
|
||||
|
||||
propagatedNativeBuildInputs = xorg.xorgserver.propagatedNativeBuildInputs;
|
||||
propagatedBuildInputs = xorg.xorgserver.propagatedBuildInputs;
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
|
|
|
@ -14,18 +14,17 @@ assert selinuxSupport -> libselinux != null && libsepol != null;
|
|||
with lib;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "coreutils-8.27";
|
||||
name = "coreutils-8.28";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/coreutils/${name}.tar.xz";
|
||||
sha256 = "0sv547572iq8ayy8klir4hnngnx92a9nsazmf1wgzfc7xr4x74c8";
|
||||
sha256 = "0r8c1bgm68kl70j1lgd0rv12iykw6143k4m9a56xip9rc2hv25qi";
|
||||
};
|
||||
|
||||
# FIXME needs gcc 4.9 in bootstrap tools
|
||||
hardeningDisable = [ "stackprotector" ];
|
||||
|
||||
patches = optional hostPlatform.isCygwin ./coreutils-8.23-4.cygwin.patch
|
||||
++ optional hostPlatform.isDarwin stdenv.secure-format-patch;
|
||||
patches = optional hostPlatform.isCygwin ./coreutils-8.23-4.cygwin.patch;
|
||||
|
||||
# The test tends to fail on btrfs and maybe other unusual filesystems.
|
||||
postPatch = optionalString (!hostPlatform.isDarwin) ''
|
||||
|
|
|
@ -11,7 +11,8 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "1cc4xxv72a82p1w9r76090xba7g069r41bi4zx32k4gz3vyl1am6";
|
||||
};
|
||||
|
||||
buildInputs = [ cmake extra-cmake-modules qtquickcontrols kconfigwidgets kdeclarative kdecoration ];
|
||||
nativeBuildInputs = [ cmake extra-cmake-modules ];
|
||||
buildInputs = [ qtquickcontrols kconfigwidgets kdeclarative kdecoration ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Allows to preview a KDecoration plugin";
|
||||
|
|
|
@ -233,7 +233,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
patches = [ ./nixos.patch ];
|
||||
|
||||
hardeningDisable = "all";
|
||||
hardeningDisable = [ "all" ];
|
||||
dontPatchELF = true;
|
||||
dontStrip = true;
|
||||
|
||||
|
|
|
@ -1,17 +1,18 @@
|
|||
{stdenv, fetchurl, pkgconfig, libbsd}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "netcat-openbsd-1.105";
|
||||
version = "1.105";
|
||||
version = "1.130";
|
||||
deb-version = "${version}-3";
|
||||
name = "netcat-openbsd-${version}";
|
||||
|
||||
srcs = [
|
||||
(fetchurl {
|
||||
url = "mirror://debian/pool/main/n/netcat-openbsd/netcat-openbsd_1.105.orig.tar.gz";
|
||||
sha256 = "07i1vcz8ycnfwsvz356rqmim8akfh8yhjzmhc5mqf5hmdkk3yra0";
|
||||
url = "mirror://debian/pool/main/n/netcat-openbsd/netcat-openbsd_${version}.orig.tar.gz";
|
||||
sha256 = "0nqy14yvclgzs98gv0fwp6jlfpfy2kk367zka648jiqbbl30awpx";
|
||||
})
|
||||
(fetchurl {
|
||||
url = "mirror://debian/pool/main/n/netcat-openbsd/netcat-openbsd_1.105-7.debian.tar.gz";
|
||||
sha256 = "0qxkhbwcifrps34s5mzzg79cmkvz3f96gphd3pl978pygwr5krzf";
|
||||
url = "mirror://debian/pool/main/n/netcat-openbsd/netcat-openbsd_${deb-version}.debian.tar.xz";
|
||||
sha256 = "0f9409vjm6v8a7m1zf5sr7wj6v5v8414i5vvxx1r45c11h69hh9a";
|
||||
})
|
||||
];
|
||||
|
||||
|
@ -26,10 +27,11 @@ stdenv.mkDerivation rec {
|
|||
install -Dm0644 nc.1 $out/share/man/man1/nc.1
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = http://packages.debian.org/netcat-openbsd;
|
||||
meta = with stdenv.lib; {
|
||||
homepage = https://packages.debian.org/netcat-openbsd;
|
||||
description = "TCP/IP swiss army knife, OpenBSD variant";
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ willibutz ];
|
||||
};
|
||||
|
||||
}
|
||||
|
|
|
@ -4,11 +4,11 @@ with stdenv.lib;
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "highlight-${version}";
|
||||
version = "3.35";
|
||||
version = "3.39";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.andre-simon.de/zip/${name}.tar.bz2";
|
||||
sha256 = "8a14b49f5e0c07daa9f40b4ce674baa00bb20061079473a5d386656f6d236d05";
|
||||
sha256 = "0z8gs69sqlyis4kvl8wwdgzywi199k73kkvn1mf9pf60npvcxwj4";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ] ++ optional stdenv.isDarwin gcc ;
|
||||
|
|
|
@ -330,8 +330,6 @@ with pkgs;
|
|||
|
||||
fixDarwinDylibNames = makeSetupHook { } ../build-support/setup-hooks/fix-darwin-dylib-names.sh;
|
||||
|
||||
fixDarwinFrameworks = makeSetupHook { } ../build-support/setup-hooks/fix-darwin-frameworks.sh;
|
||||
|
||||
keepBuildTree = makeSetupHook { } ../build-support/setup-hooks/keep-build-tree.sh;
|
||||
|
||||
enableGCOVInstrumentation = makeSetupHook { } ../build-support/setup-hooks/enable-coverage-instrumentation.sh;
|
||||
|
@ -6892,13 +6890,14 @@ with pkgs;
|
|||
inherit (darwin) ps;
|
||||
};
|
||||
|
||||
cmake = callPackage ../development/tools/build-managers/cmake {
|
||||
cmake = libsForQt5.callPackage ../development/tools/build-managers/cmake {
|
||||
inherit (darwin) ps;
|
||||
};
|
||||
|
||||
cmakeCurses = cmake.override { useNcurses = true; };
|
||||
|
||||
cmakeWithGui = cmakeCurses.override { useQt4 = true; };
|
||||
cmakeWithGui = cmakeCurses.override { withQt5 = true; };
|
||||
cmakeWithQt4Gui = cmakeCurses.override { useQt4 = true; };
|
||||
|
||||
# Does not actually depend on Qt 5
|
||||
inherit (kdeFrameworks) extra-cmake-modules kapidox kdoctools;
|
||||
|
@ -11932,53 +11931,12 @@ with pkgs;
|
|||
|
||||
crda = callPackage ../os-specific/linux/crda { };
|
||||
|
||||
darwin = let
|
||||
apple-source-releases = callPackage ../os-specific/darwin/apple-source-releases { };
|
||||
in (apple-source-releases // rec {
|
||||
cctools = callPackage ../os-specific/darwin/cctools/port.nix {
|
||||
inherit libobjc;
|
||||
stdenv = if stdenv.isDarwin then stdenv else libcxxStdenv;
|
||||
inherit maloader;
|
||||
xctoolchain = xcode.toolchain;
|
||||
};
|
||||
|
||||
cf-private = callPackage ../os-specific/darwin/cf-private {
|
||||
inherit (apple-source-releases) CF;
|
||||
inherit osx_private_sdk;
|
||||
};
|
||||
|
||||
maloader = callPackage ../os-specific/darwin/maloader {
|
||||
inherit opencflite;
|
||||
};
|
||||
|
||||
opencflite = callPackage ../os-specific/darwin/opencflite {};
|
||||
|
||||
swift-corefoundation = callPackage ../os-specific/darwin/swift-corefoundation {};
|
||||
|
||||
ios-cross = callPackage ../os-specific/darwin/ios-cross {
|
||||
inherit (darwin) binutils;
|
||||
};
|
||||
|
||||
xcode = callPackage ../os-specific/darwin/xcode {};
|
||||
|
||||
osx_private_sdk = callPackage ../os-specific/darwin/osx-private-sdk {};
|
||||
|
||||
security_tool = (newScope (darwin.apple_sdk.frameworks // darwin)) ../os-specific/darwin/security-tool {
|
||||
Security-framework = darwin.apple_sdk.frameworks.Security;
|
||||
};
|
||||
|
||||
binutils = callPackage ../os-specific/darwin/binutils { inherit cctools; };
|
||||
|
||||
apple_sdk = callPackage ../os-specific/darwin/apple-sdk {};
|
||||
|
||||
libobjc = apple-source-releases.objc4;
|
||||
|
||||
stubs = callPackages ../os-specific/darwin/stubs {};
|
||||
|
||||
usr-include = callPackage ../os-specific/darwin/usr-include {};
|
||||
|
||||
DarwinTools = callPackage ../os-specific/darwin/DarwinTools {};
|
||||
});
|
||||
# Darwin package set
|
||||
#
|
||||
# Even though this is a set of packages not single package, use `callPackage`
|
||||
# not `callPackages` so the per-package callPackages don't have their
|
||||
# `.override` clobbered. C.F. `llvmPackages` which does the same.
|
||||
darwin = callPackage ./darwin-packages.nix { };
|
||||
|
||||
devicemapper = lvm2;
|
||||
|
||||
|
|
56
pkgs/top-level/darwin-packages.nix
Normal file
56
pkgs/top-level/darwin-packages.nix
Normal file
|
@ -0,0 +1,56 @@
|
|||
{ pkgs, darwin, stdenv, callPackage, callPackages, newScope }:
|
||||
|
||||
let
|
||||
apple-source-releases = callPackage ../os-specific/darwin/apple-source-releases { };
|
||||
in
|
||||
|
||||
(apple-source-releases // {
|
||||
|
||||
callPackage = newScope (darwin.apple_sdk.frameworks // darwin);
|
||||
|
||||
apple_sdk = callPackage ../os-specific/darwin/apple-sdk { };
|
||||
|
||||
binutils = callPackage ../os-specific/darwin/binutils {
|
||||
inherit (darwin) cctools;
|
||||
};
|
||||
|
||||
cctools = callPackage ../os-specific/darwin/cctools/port.nix {
|
||||
inherit (darwin) libobjc maloader;
|
||||
stdenv = if stdenv.isDarwin then stdenv else pkgs.libcxxStdenv;
|
||||
xctoolchain = darwin.xcode.toolchain;
|
||||
};
|
||||
|
||||
cf-private = callPackage ../os-specific/darwin/cf-private {
|
||||
inherit (apple-source-releases) CF;
|
||||
inherit (darwin) osx_private_sdk;
|
||||
};
|
||||
|
||||
DarwinTools = callPackage ../os-specific/darwin/DarwinTools { };
|
||||
|
||||
maloader = callPackage ../os-specific/darwin/maloader {
|
||||
inherit (darwin) opencflite;
|
||||
};
|
||||
|
||||
ios-cross = callPackage ../os-specific/darwin/ios-cross {
|
||||
inherit (darwin) binutils;
|
||||
};
|
||||
|
||||
libobjc = apple-source-releases.objc4;
|
||||
|
||||
opencflite = callPackage ../os-specific/darwin/opencflite { };
|
||||
|
||||
osx_private_sdk = callPackage ../os-specific/darwin/osx-private-sdk { };
|
||||
|
||||
security_tool = darwin.callPackage ../os-specific/darwin/security-tool {
|
||||
Security-framework = darwin.apple_sdk.frameworks.Security;
|
||||
};
|
||||
|
||||
stubs = callPackages ../os-specific/darwin/stubs { };
|
||||
|
||||
swift-corefoundation = callPackage ../os-specific/darwin/swift-corefoundation { };
|
||||
|
||||
usr-include = callPackage ../os-specific/darwin/usr-include { };
|
||||
|
||||
xcode = callPackage ../os-specific/darwin/xcode { };
|
||||
|
||||
})
|
Loading…
Reference in a new issue