head 1.2; access; symbols pkgsrc-2018Q1:1.1.0.48 pkgsrc-2018Q1-base:1.1 pkgsrc-2017Q4:1.1.0.46 pkgsrc-2017Q4-base:1.1 pkgsrc-2017Q3:1.1.0.44 pkgsrc-2017Q3-base:1.1 pkgsrc-2017Q2:1.1.0.40 pkgsrc-2017Q2-base:1.1 pkgsrc-2017Q1:1.1.0.38 pkgsrc-2017Q1-base:1.1 pkgsrc-2016Q4:1.1.0.36 pkgsrc-2016Q4-base:1.1 pkgsrc-2016Q3:1.1.0.34 pkgsrc-2016Q3-base:1.1 pkgsrc-2016Q2:1.1.0.32 pkgsrc-2016Q2-base:1.1 pkgsrc-2016Q1:1.1.0.30 pkgsrc-2016Q1-base:1.1 pkgsrc-2015Q4:1.1.0.28 pkgsrc-2015Q4-base:1.1 pkgsrc-2015Q3:1.1.0.26 pkgsrc-2015Q3-base:1.1 pkgsrc-2015Q2:1.1.0.24 pkgsrc-2015Q2-base:1.1 pkgsrc-2015Q1:1.1.0.22 pkgsrc-2015Q1-base:1.1 pkgsrc-2014Q4:1.1.0.20 pkgsrc-2014Q4-base:1.1 pkgsrc-2014Q3:1.1.0.18 pkgsrc-2014Q3-base:1.1 pkgsrc-2014Q2:1.1.0.16 pkgsrc-2014Q2-base:1.1 pkgsrc-2014Q1:1.1.0.14 pkgsrc-2014Q1-base:1.1 pkgsrc-2013Q4:1.1.0.12 pkgsrc-2013Q4-base:1.1 pkgsrc-2013Q3:1.1.0.10 pkgsrc-2013Q3-base:1.1 pkgsrc-2013Q2:1.1.0.8 pkgsrc-2013Q2-base:1.1 pkgsrc-2013Q1:1.1.0.6 pkgsrc-2013Q1-base:1.1 pkgsrc-2012Q4:1.1.0.4 pkgsrc-2012Q4-base:1.1 pkgsrc-2012Q3:1.1.0.2 pkgsrc-2012Q3-base:1.1; locks; strict; comment @# @; 1.2 date 2018.05.23.07.56.54; author triaxx; state dead; branches; next 1.1; commitid sqZEtt8H9un5xoDA; 1.1 date 2012.07.29.21.44.13; author gsutre; state Exp; branches; next ; desc @@ 1.2 log @grub2: update to 2.02 * Remove patches fixed in upstream * Remove 'CONFIGURE_ARGS+= --disable-grub-emu-usb': option no more supported * Fix DejaVu search path * Remove hack for use of pkgsrc's flex on NetBSD (that causes build errors) * Disable SSP checking (that causes linking errors) Changes: New in 2.02: * New/improved filesystem and disk support: * Big-endian UFS1. * Experimental 64-bit ext2 support. * Various fixes for non-512-byte sector devices. * New `proc' filesystem framework, used by LUKS disks. * Fix DM-RAID partition handling. * New `nativedisk' command to switch from firmware to native disk drivers. * Compressed HFS+. * DragonFly BSD labels. * CBFS (coreboot). * Handle partitioned LVM properly. * Use LVM UUIDs whenever possible. * GPT PReP. * New `progress' module that shows progress information while reading files. * ZFS features support. * ZFS LZ4 support. * XFS V5 format support. * LVM RAID1 support. * New/improved terminal and video support: * Monochrome text (matching `hercules' in GRUB Legacy). * Morse code output using system speaker. * `spkmodem' output (simple data protocol using system speaker). * Handle Japanese special keys. * coreboot framebuffer. * Serial on ARC. * Native vt100 handling for grub-emu, replacing the use of the curses library. * New gfxmenu options for terminal window positioning, theme background image handling, and scrollbar padding, plus `item_pixmap_style' and `highlight_overlay'. * Support several more image types (paletted and greyscale). * Boot protocol improvements: * Support Apple FAT binaries on non-Apple platforms. * Improve FreeDOS direct loading support compatibility. * Enable `linux16' on all x86 platforms, not just BIOS. * New TrueCrypt ISO loader. * multiboot2 boot-services EFI specification. * multiboot2 EFI memory map specification. * multiboot2 full-file specfication. * New/improved network support: * New variables `net_default_*' containing properties of the default interface. * Autoload `http' and `tftp' modules if necessary. * Improve TFTP robustness. * Parse `nd' disk names in GRUB Legacy configuration files. * Issue separate DNS queries for IPv4 and IPv6. * Support IPv6 Router Advertisement to configure default router. * New variable net__next_server containing next server from BOOTP reply. * Coreboot improvements: * CBFS support both in on-disk images (loopback) and flash. * Ability to launch another payload from flash or disk * Coreboot framebuffer * CBMEMC support (both logging and inspecting logs) * Command for inspecting coreboot timestamps (`coreboot_boottime'). * Command for inspecting coreboot tables (`lscoreboot'). * New target default_payload.elf. * Increased maximal core size. * Prefer pmtimer for TSC calibration. * New/improved platform support: * New `efifwsetup' and `lsefi' commands on EFI platforms. * New `cmosdump' and `cmosset' commands on platforms with CMOS support. * New command `pcidump' for PCI platforms. * Improve opcode parsing in ACPI halt implementation. * Use the TSC as a possible time source on i386-ieee1275. * Merge PowerPC grub-mkrescue implementation with the common one. * Support grub-mkrescue on i386-ieee1275, sparc64, bootinfo machines such as pSeries, and mips-arc. * Make grub-mkrescue better support Apple Intel Macs on CD. * Enable GRUB Legacy configuration file parsing on EFI. * Support halt for Loongson 2E. * ARM U-Boot and EFI ports. * Reorganise platform-dependent code in utilities to avoid #ifdef mess. * AROS and Haiku support for userspace utilities. * Xen PV port. * Fix EFI stack alignment. * ARM64 EFI port. * On Linux, read partition start offsets from sysfs if possible. * New grub-macbless utility, and better integration with Mac firmware in grub-install. * Support Yeeloong 3A. * Add `cpuid --pae' option to detect Physical Address Extension on x86. * Support for USB debug dongles. * Support for *-emu on all platforms (previously only i386/x86_64 worked). * Support *-emu on Windows. * New platform `none' which builds only user level utilities. This is now default if target CPU is not supported. * Support for booting little-endian Linux kernel on powerpc. * Support network boot with Oracle sun4v vnet devices. * Added SAS disks to the IEEE 1275 Open Firmware device list. * Try multiple methods for TSC (timestamp counter) calibration - PIT, pmtimer, EFI Stall. If everything fails, use hardcoded frequency 800MHz. * Support Hyper-V Gen2 platforms which lack PIT for TSC calibration. * Map UEFI Persistent Memory to E820 persistent memory. * New Xen loader on ARM64. * Respect alignment requirement for block device IO buffers on EFI. * Security: * Add optional facility to enforce that all files read by the core image from disk have a valid detached digital signature. * Performance: * Avoid costly division operations in many places. * New boot time analysis framework (`./configure --enable-boot-time'). * Initialise USB ports in parallel. * New `testspeed' command to test file read speed. * Speed-up gfxterm by storing intermediate results in more compact format. * Lazy LVM/mdraid scan. * Disk hints. * Scripting: * New `eval' and `tr' commands. * grub-script-check fails on scripts containing no commands. * Installation and other utility improvements: * Add option to compress files on installation or image creation. * Using grub-reboot no longer requires setting `GRUB_DEFAULT=saved'. * Support probing EFI System Partition (requires os-prober >= 1.58). * Fix inconsistent use of `GRUB_CRYPTODISK_ENABLE' and `GRUB_ENABLE_CRYPTODISK'; the latter is now used consistently. * grub-mount handles symbolic links to directories. * Support disabling submenus with `GRUB_DISABLE_SUBMENU' configuration key for grub-mkconfig. * grub-install, grub-mknetdir, grub-mkrescue, and grub-mkstandalone rewritten in C. They should now work in supported non-Unix-like environments. * Native mingw support. * Ability to install on EFI under windows. * Reorganise timeout handling using new `timeout_style' environment variable and `GRUB_TIMEOUT_STYLE' configuration key for grub-mkconfig. Menu hotkeys pressed during a hidden timeout now boot the corresponding menu entry immediately. * New `file' command and grub-file utility to check file types. * New syslinux configuration file parser. * Set menu entry class to primary OS name returned by os-prober to display OS specific icon. * On Linux x86 detect EFI word size in grub-install and automatically select correct platform (x86_64-efi or i386-efi) to install. Requires Linux kernel 4.0 or higher. * Build system: * Remove all uses of nested functions; GRUB no longer requires an executable stack. * Fix documentation build with Texinfo >= 5.1. * More robust and documented cross-compiling support. * Partial clang support for some platforms (experimental). * Partial mingw64 x86_64-efi compile support (highly experimental). * Partial mingw32 i386-* (other than already present i386-pc) compile support (highly experimental). * Support for grub-mkpasswd on Windows. * Eliminate the use of AutoGen. This allowed some performance improvements to the build system. * Remove variable length arrays. * OpenBSD compile and tools support (NetBSD and FreeBSD were already supported). * Fix build with FreeType >= 2.5.1. * Make gentpl.py compatible with Python 3. It now requires at least Python 2.6. * modinfo.sh contains build information now. * Added many new tests to improve robustness. * Target is built without libgcc now. Necessary builtins are reimplemented directly. This removes requirement for target-specific runtime on build system. * emu libusb support removed (was broken and unmaintained). * powerpc64le compile support. * Use fixed timestamp when generating GRUB image for reproducible builds. * Verify at build time that modules contain only supported relocations and their structure matches what boot-time module loader expects. * Do not require fonts on powerpc-ieee1275. * Revision control moved to git. @ text @$NetBSD: patch-stpcpy-1.diff,v 1.1 2012/07/29 21:44:13 gsutre Exp $ Add gnulib's stpcpy. === modified file 'grub-core/gnulib/Makefile.am' --- grub-core/gnulib/Makefile.am 2010-09-20 23:09:23 +0000 +++ grub-core/gnulib/Makefile.am 2012-07-28 13:09:43 +0000 @@@@ -9,7 +9,7 @@@@ # the same distribution terms as the rest of that program. # # Generated by gnulib-tool. -# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=grub-core/gnulib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --no-libtool --macro-prefix=gl --no-vc-files argp error fnmatch getdelim getline gettext progname regex +# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=grub-core/gnulib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --no-libtool --macro-prefix=gl --no-vc-files argp error fnmatch getdelim getline gettext progname regex stpcpy AUTOMAKE_OPTIONS = 1.5 gnits @@@@ -859,6 +859,15 @@@@ ## end gnulib module stdlib +## begin gnulib module stpcpy + + +EXTRA_DIST += stpcpy.c + +EXTRA_libgnu_a_SOURCES += stpcpy.c + +## end gnulib module stpcpy + ## begin gnulib module strcase === added file 'grub-core/gnulib/stpcpy.c' --- grub-core/gnulib/stpcpy.c 1970-01-01 00:00:00 +0000 +++ grub-core/gnulib/stpcpy.c 2012-07-28 13:09:38 +0000 @@@@ -0,0 +1,49 @@@@ +/* stpcpy.c -- copy a string and return pointer to end of new string + Copyright (C) 1992, 1995, 1997-1998, 2006, 2009-2010 Free Software + Foundation, Inc. + + NOTE: The canonical source of this file is maintained with the GNU C Library. + Bugs can be reported to bug-glibc@@prep.ai.mit.edu. + + This program is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by the + Free Software Foundation; either version 3 of the License, or any + later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . */ + +#include + +#include + +#undef __stpcpy +#ifdef _LIBC +# undef stpcpy +#endif + +#ifndef weak_alias +# define __stpcpy stpcpy +#endif + +/* Copy SRC to DEST, returning the address of the terminating '\0' in DEST. */ +char * +__stpcpy (char *dest, const char *src) +{ + register char *d = dest; + register const char *s = src; + + do + *d++ = *s; + while (*s++ != '\0'); + + return d - 1; +} +#ifdef weak_alias +weak_alias (__stpcpy, stpcpy) +#endif === modified file 'm4/gnulib-cache.m4' --- m4/gnulib-cache.m4 2010-09-20 23:09:23 +0000 +++ m4/gnulib-cache.m4 2012-07-28 13:09:43 +0000 @@@@ -15,7 +15,7 @@@@ # Specification in the form of a command-line invocation: -# gnulib-tool --import --dir=. --lib=libgnu --source-base=grub-core/gnulib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --no-libtool --macro-prefix=gl --no-vc-files argp error fnmatch getdelim getline gettext progname regex +# gnulib-tool --import --dir=. --lib=libgnu --source-base=grub-core/gnulib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --no-libtool --macro-prefix=gl --no-vc-files argp error fnmatch getdelim getline gettext progname regex stpcpy # Specification in the form of a few gnulib-tool.m4 macro invocations: gl_LOCAL_DIR([]) @@@@ -28,6 +28,7 @@@@ gettext progname regex + stpcpy ]) gl_AVOID([]) gl_SOURCE_BASE([grub-core/gnulib]) === modified file 'm4/gnulib-comp.m4' --- m4/gnulib-comp.m4 2010-09-20 23:09:23 +0000 +++ m4/gnulib-comp.m4 2012-07-28 13:09:44 +0000 @@@@ -73,6 +73,7 @@@@ # Code from module stdint: # Code from module stdio: # Code from module stdlib: + # Code from module stpcpy: # Code from module strcase: # Code from module strchrnul: # Code from module streq: @@@@ -221,6 +222,9 @@@@ gl_STDIO_H # Code from module stdlib: gl_STDLIB_H + # Code from module stpcpy: + gl_FUNC_STPCPY + gl_STRING_MODULE_INDICATOR([stpcpy]) # Code from module strcase: gl_STRCASE # Code from module strchrnul: @@@@ -482,6 +486,7 @@@@ lib/stdio-write.c lib/stdio.in.h lib/stdlib.in.h + lib/stpcpy.c lib/strcasecmp.c lib/strchrnul.c lib/strchrnul.valgrind @@@@ -576,6 +581,7 @@@@ m4/stdint_h.m4 m4/stdio_h.m4 m4/stdlib_h.m4 + m4/stpcpy.m4 m4/strcase.m4 m4/strchrnul.m4 m4/strerror.m4 === added file 'm4/stpcpy.m4' --- m4/stpcpy.m4 1970-01-01 00:00:00 +0000 +++ m4/stpcpy.m4 2012-07-28 13:09:38 +0000 @@@@ -0,0 +1,26 @@@@ +# stpcpy.m4 serial 7 +dnl Copyright (C) 2002, 2007, 2009, 2010 Free Software Foundation, Inc. +dnl This file is free software; the Free Software Foundation +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. + +AC_DEFUN([gl_FUNC_STPCPY], +[ + dnl Persuade glibc to declare stpcpy(). + AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS]) + + dnl The stpcpy() declaration in lib/string.in.h uses 'restrict'. + AC_REQUIRE([AC_C_RESTRICT]) + + AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS]) + AC_REPLACE_FUNCS([stpcpy]) + if test $ac_cv_func_stpcpy = no; then + HAVE_STPCPY=0 + gl_PREREQ_STPCPY + fi +]) + +# Prerequisites of lib/stpcpy.c. +AC_DEFUN([gl_PREREQ_STPCPY], [ + : +]) @ 1.1 log @Import grub2-2.00 as sysutils/grub2. This is GRUB 2, the second version of the GRand Unified Bootloader. GRUB 2 is rewritten from scratch to make GNU GRUB cleaner, safer, more robust, more powerful, and more portable. @ text @d1 1 a1 1 $NetBSD$ @