diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2009-05-30 22:59:29 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2009-05-30 22:59:29 +0200 |
| commit | fb6cd4f4dff71a803ba9db7751ade84fa6eac3a8 (patch) | |
| tree | 379626b7b419ac1643131a7b8ac07e9fb87b9f80 /package/htpdate/patches/patch-htpdate_c | |
| parent | 5157a34410fe9eff94d5de7100cbc3659d6c4fcb (diff) | |
| parent | ba3359722cbf8aa7b0ed39e1f81d1d74ec88fecd (diff) | |
Merge branch 'master' of ssh://openadk.org/git/openadk
resolve conflicts
Conflicts:
mk/pkg-bottom.mk
package/ctorrent/Makefile
package/gcc/Makefile
package/gmp/Makefile
package/id3lib/Makefile
package/libelf/Makefile
package/libnl/patches/patch-include_netlink-local_h
package/mpd/Makefile
package/nmap/Makefile
package/rrs/Makefile
package/weechat/Makefile
scripts/rstrip.sh
target/Config.in
Diffstat (limited to 'package/htpdate/patches/patch-htpdate_c')
| -rw-r--r-- | package/htpdate/patches/patch-htpdate_c | 55 |
1 files changed, 55 insertions, 0 deletions
diff --git a/package/htpdate/patches/patch-htpdate_c b/package/htpdate/patches/patch-htpdate_c new file mode 100644 index 000000000..6dec28424 --- /dev/null +++ b/package/htpdate/patches/patch-htpdate_c @@ -0,0 +1,55 @@ +$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ +--- htpdate-1.0.3.orig/htpdate.c 2008-09-02 22:24:09.000000000 +0200 ++++ htpdate-1.0.3/htpdate.c 2009-05-29 14:28:27.252071728 +0200 +@@ -351,6 +351,7 @@ static int setclock( double timedelta, i + } + + ++#if 0 + static int htpdate_adjtimex( double drift ) { + struct timex tmx; + long freq; +@@ -379,6 +380,7 @@ static int htpdate_adjtimex( double drif + } + + } ++#endif + + + static void showhelp() { +@@ -404,7 +406,6 @@ Usage: htpdate [-046abdhlqstxD] [-i pid + -s set time\n\ + -t turn off sanity time check\n\ + -u run daemon as user\n\ +- -x adjust kernel clock\n\ + host web server hostname or ip address (maximum of 16)\n\ + port port number (default 80 and 8080 for proxy server)\n"); + +@@ -584,9 +585,11 @@ int main( int argc, char *argv[] ) { + } + } + break; ++#if 0 + case 'x': /* adjust time and "kernel" */ + setmode = 3; + break; ++#endif + case 'D': /* run as daemon */ + daemonize = 1; + logmode = 1; +@@ -777,6 +780,7 @@ int main( int argc, char *argv[] ) { + printlog( 0, "Drift %.2f PPM, %.2f s/day", \ + drift*1e6, drift*86400 ); + ++#if 0 + /* Adjust system clock */ + if ( setmode == 3 ) { + starttime = time(NULL); +@@ -787,6 +791,7 @@ int main( int argc, char *argv[] ) { + /* Drop root privileges again */ + if ( sw_uid ) seteuid( sw_uid ); + } ++#endif + } else { + starttime = time(NULL); + } |