From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Leo Newsgroups: gmane.emacs.devel Subject: Re: Move sha1 to C? Date: Tue, 24 May 2011 02:14:04 +0800 Message-ID: References: NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: dough.gmane.org 1306174460 7176 80.91.229.12 (23 May 2011 18:14:20 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Mon, 23 May 2011 18:14:20 +0000 (UTC) Cc: Paul Eggert , emacs-devel@gnu.org To: Stefan Monnier Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon May 23 20:14:16 2011 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([140.186.70.17]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1QOZdv-0004Az-SE for ged-emacs-devel@m.gmane.org; Mon, 23 May 2011 20:14:16 +0200 Original-Received: from localhost ([::1]:59877 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QOZdv-00037H-9B for ged-emacs-devel@m.gmane.org; Mon, 23 May 2011 14:14:15 -0400 Original-Received: from eggs.gnu.org ([140.186.70.92]:59741) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QOZds-00037B-NB for emacs-devel@gnu.org; Mon, 23 May 2011 14:14:13 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QOZdr-00011Y-7D for emacs-devel@gnu.org; Mon, 23 May 2011 14:14:12 -0400 Original-Received: from mail-pz0-f41.google.com ([209.85.210.41]:57082) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QOZdq-00011F-RU for emacs-devel@gnu.org; Mon, 23 May 2011 14:14:11 -0400 Original-Received: by pzk4 with SMTP id 4so3641865pzk.0 for ; Mon, 23 May 2011 11:14:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version:content-type; bh=CvIM4dHpar9WJNi67fsGnetfBOrv2JpRMB5a1V3Fzow=; b=g3QsMEkmLw/Ndkj0XCtGdqWsq10dX3TJVZnrfROKlPSZDfZudSBOmZOaZ7dt1mZJ3V pZ26wtpdjHDqUtYcR0xjAnZzpS1AA35qXI1I0Lb0O+SmCNeiDACjNxxPKJeXdvHN9zuh 2buvaMF4/1ZYEa6v7gglhLEy+MWlA0ssdxex4= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version:content-type; b=S5DE6gOwrQo2mu02qLROOP4cOoSau5HFX4fnfB11JkltQQPOm8jcSMFMnmoIcDOjbm egG4oB+v7zVnOMl4EExHlh4uvAASXrqtxjHzQqh4s038uRlMSq+M+fDc76vSfdN1QNtK H5DZ9SMRbPyB2bt6S8SuTPsrh4TV7YBBAzOMA= Original-Received: by 10.68.17.7 with SMTP id k7mr2257909pbd.322.1306174449802; Mon, 23 May 2011 11:14:09 -0700 (PDT) Original-Received: from th041094.ip.tsinghua.edu.cn (th041067.ip.tsinghua.edu.cn [59.66.41.67]) by mx.google.com with ESMTPS id h9sm4472671pbc.36.2011.05.23.11.14.07 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 23 May 2011 11:14:09 -0700 (PDT) In-Reply-To: (Stefan Monnier's message of "Mon, 23 May 2011 10:57:25 -0300") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.3.50 (Mac OS X 10.6.7) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 209.85.210.41 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:139658 Archived-At: CC'd Paul for help. On 2011-05-23 21:57 +0800, Stefan Monnier wrote: [snipped 26 lines] > Since these all seem to be related to the addition of the sha1 module > from gnulib (as opposed to being unrelated changes brought in by the > "sync with latest gnulib" that happened as a side-effect), I'd include > them in the commit in the normal way (i.e. more or less as if you'd > done those changes by hand, tho the ChangeLog can be a bit more concise). > > > Stefan I run gnulib-tool on OSX and get tons of lines such as: sed: 1: "/^ *unistd *$/{s/^.*$/t ...": bad flag in substitute command: '}' ../gnulib/gnulib-tool: line 801: printf: write error: Broken pipe In addition, the auto-generated files seem to have changes unrelated to sha1 (see the example attached to the end). What to do? Leo === modified file 'lib/gnulib.mk' --- lib/gnulib.mk 2011-05-18 00:39:40 +0000 +++ lib/gnulib.mk 2011-05-23 07:22:44 +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=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=. --makefile-name=gnulib.mk --no-libtool --macro-prefix=gl --no-vc-files careadlinkat crypto/md5 dtoastr filemode getloadavg getopt-gnu ignore-value intprops lstat mktime readlink socklen stdarg stdio strftime strtoumax symlink sys_stat +# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=. --makefile-name=gnulib.mk --no-libtool --macro-prefix=gl --no-vc-files careadlinkat crypto/md5 crypto/sha1 dtoastr filemode getloadavg getopt-gnu ignore-value intprops lstat mktime readlink socklen stdarg stdio strftime strtoumax symlink sys_stat MOSTLYCLEANFILES += core *.stackdump @@ -94,11 +94,18 @@ ## end gnulib module crypto/md5 +## begin gnulib module crypto/sha1 + + +EXTRA_DIST += sha1.c sha1.h + +EXTRA_libgnu_a_SOURCES += sha1.c + +## end gnulib module crypto/sha1 + ## begin gnulib module dosname -if gl_GNULIB_ENABLED_dosname -endif EXTRA_DIST += dosname.h ## end gnulib module dosname @@ -159,10 +166,8 @@ ## begin gnulib module gettext-h -if gl_GNULIB_ENABLED_be453cec5eecf5731a274f2de7f2db36 libgnu_a_SOURCES += gettext.h -endif ## end gnulib module gettext-h ## begin gnulib module ignore-value @@ -250,9 +255,7 @@ ## begin gnulib module stat -if gl_GNULIB_ENABLED_stat -endif EXTRA_DIST += stat.c EXTRA_libgnu_a_SOURCES += stat.c @@ -610,9 +613,7 @@ ## begin gnulib module strtoull -if gl_GNULIB_ENABLED_strtoull -endif EXTRA_DIST += strtol.c strtoul.c strtoull.c EXTRA_libgnu_a_SOURCES += strtol.c strtoul.c strtoull.c @@ -885,9 +886,7 @@ ## begin gnulib module verify -if gl_GNULIB_ENABLED_verify -endif EXTRA_DIST += verify.h ## end gnulib module verify === modified file 'm4/gl-comp.m4' --- m4/gl-comp.m4 2011-05-04 07:19:21 +0000 +++ m4/gl-comp.m4 2011-05-23 18:01:16 +0000 @@ -31,6 +31,7 @@ # Code from module c++defs: # Code from module careadlinkat: # Code from module crypto/md5: + # Code from module crypto/sha1: # Code from module dosname: # Code from module dtoastr: # Code from module extensions: @@ -92,6 +93,7 @@ gl_source_base='lib' AC_CHECK_FUNCS_ONCE([readlinkat]) gl_MD5 +gl_SHA1 AC_REQUIRE([gl_C99_STRTOLD]) gl_FILEMODE gl_GETLOADAVG([$gl_source_base]) @@ -99,6 +101,8 @@ gl_FUNC_GETOPT_GNU gl_MODULE_INDICATOR_FOR_TESTS([getopt-gnu]) gl_FUNC_GETOPT_POSIX +AC_SUBST([LIBINTL]) +AC_SUBST([LTLIBINTL]) AC_REQUIRE([AC_C_INLINE]) gl_INTTYPES_INCOMPLETE gl_FUNC_LSTAT @@ -110,6 +114,8 @@ gl_UNISTD_MODULE_INDICATOR([readlink]) gl_TYPE_SOCKLEN_T gt_TYPE_SSIZE_T +gl_FUNC_STAT +gl_SYS_STAT_MODULE_INDICATOR([stat]) gl_STDARG_H AM_STDBOOL_H gl_STDDEF_H @@ -117,6 +123,8 @@ gl_STDIO_H gl_STDLIB_H gl_FUNC_GNU_STRFTIME +gl_FUNC_STRTOULL +gl_STDLIB_MODULE_INDICATOR([strtoull]) gl_FUNC_STRTOUMAX gl_INTTYPES_MODULE_INDICATOR([strtoumax]) gl_FUNC_SYMLINK @@ -127,74 +135,7 @@ gl_TIME_R gl_TIME_MODULE_INDICATOR([time_r]) gl_UNISTD_H - gl_gnulib_enabled_dosname=false - gl_gnulib_enabled_be453cec5eecf5731a274f2de7f2db36=false - gl_gnulib_enabled_stat=false - gl_gnulib_enabled_strtoull=false - gl_gnulib_enabled_verify=false - func_gl_gnulib_m4code_dosname () - { - if ! $gl_gnulib_enabled_dosname; then - gl_gnulib_enabled_dosname=true - fi - } - func_gl_gnulib_m4code_be453cec5eecf5731a274f2de7f2db36 () - { - if ! $gl_gnulib_enabled_be453cec5eecf5731a274f2de7f2db36; then -AC_SUBST([LIBINTL]) -AC_SUBST([LTLIBINTL]) - gl_gnulib_enabled_be453cec5eecf5731a274f2de7f2db36=true - fi - } - func_gl_gnulib_m4code_stat () - { - if ! $gl_gnulib_enabled_stat; then -gl_FUNC_STAT -gl_SYS_STAT_MODULE_INDICATOR([stat]) - gl_gnulib_enabled_stat=true - if $condition; then - func_gl_gnulib_m4code_dosname - fi - fi - } - func_gl_gnulib_m4code_strtoull () - { - if ! $gl_gnulib_enabled_strtoull; then -gl_FUNC_STRTOULL -gl_STDLIB_MODULE_INDICATOR([strtoull]) - gl_gnulib_enabled_strtoull=true - fi - } - func_gl_gnulib_m4code_verify () - { - if ! $gl_gnulib_enabled_verify; then - gl_gnulib_enabled_verify=true - fi - } - if test $GNULIB_UNISTD_H_GETOPT = 1; then - func_gl_gnulib_m4code_be453cec5eecf5731a274f2de7f2db36 - fi - if test $REPLACE_LSTAT = 1; then - func_gl_gnulib_m4code_dosname - fi - if test $REPLACE_LSTAT = 1; then - func_gl_gnulib_m4code_stat - fi - if test $HAVE_READLINK = 0 || test $REPLACE_READLINK = 1; then - func_gl_gnulib_m4code_stat - fi - if test "$ac_cv_have_decl_strtoumax" != yes && test $ac_cv_func_strtoumax = no; then - func_gl_gnulib_m4code_verify - fi - if test "$ac_cv_have_decl_strtoumax" != yes && test $ac_cv_func_strtoumax = no && test $ac_cv_type_unsigned_long_long_int = yes; then - func_gl_gnulib_m4code_strtoull - fi m4_pattern_allow([^gl_GNULIB_ENABLED_]) - AM_CONDITIONAL([gl_GNULIB_ENABLED_dosname], [$gl_gnulib_enabled_dosname]) - AM_CONDITIONAL([gl_GNULIB_ENABLED_be453cec5eecf5731a274f2de7f2db36], [$gl_gnulib_enabled_be453cec5eecf5731a274f2de7f2db36]) - AM_CONDITIONAL([gl_GNULIB_ENABLED_stat], [$gl_gnulib_enabled_stat]) - AM_CONDITIONAL([gl_GNULIB_ENABLED_strtoull], [$gl_gnulib_enabled_strtoull]) - AM_CONDITIONAL([gl_GNULIB_ENABLED_verify], [$gl_gnulib_enabled_verify]) # End of code from modules m4_ifval(gl_LIBSOURCES_LIST, [ m4_syscmd([test ! -d ]m4_defn([gl_LIBSOURCES_DIR])[ || @@ -364,6 +305,8 @@ lib/mktime-internal.h lib/mktime.c lib/readlink.c + lib/sha1.c + lib/sha1.h lib/stat.c lib/stdarg.in.h lib/stdbool.in.h @@ -399,6 +342,7 @@ m4/mktime.m4 m4/multiarch.m4 m4/readlink.m4 + m4/sha1.m4 m4/socklen.m4 m4/ssize_t.m4 m4/st_dm_mode.m4