mirror of
https://github.com/vincentmli/bpfire.git
synced 2026-04-14 13:02:58 +02:00
Merge branch 'glibc-update2' of ssh://git.ipfire.org/pub/git/people/ms/ipfire-2.x into glibc-update2
This commit is contained in:
Michael Tremer
@@ -1,4 +0,0 @@
|
||||
#usr/man/man8/hddtemp.8
|
||||
usr/sbin/hddtemp
|
||||
#usr/share/locale/fr/LC_MESSAGES/hddtemp.mo
|
||||
#usr/share/locale/ru/LC_MESSAGES/hddtemp.mo
|
||||
@@ -1,4 +0,0 @@
|
||||
etc/ld.so.preload
|
||||
lib/libsafe.so.2
|
||||
lib/libsafe.so.2.0.16
|
||||
#usr/man/man8/libsafe.8
|
||||
@@ -4,128 +4,167 @@
|
||||
#usr/include/vorbis/vorbisfile.h
|
||||
#usr/lib/libvorbis.a
|
||||
#usr/lib/libvorbis.la
|
||||
usr/lib/libvorbis.so
|
||||
#usr/lib/libvorbis.so
|
||||
usr/lib/libvorbis.so.0
|
||||
usr/lib/libvorbis.so.0.4.3
|
||||
usr/lib/libvorbis.so.0.4.6
|
||||
#usr/lib/libvorbisenc.a
|
||||
#usr/lib/libvorbisenc.la
|
||||
usr/lib/libvorbisenc.so
|
||||
#usr/lib/libvorbisenc.so
|
||||
usr/lib/libvorbisenc.so.2
|
||||
usr/lib/libvorbisenc.so.2.0.6
|
||||
usr/lib/libvorbisenc.so.2.0.9
|
||||
#usr/lib/libvorbisfile.a
|
||||
#usr/lib/libvorbisfile.la
|
||||
usr/lib/libvorbisfile.so
|
||||
#usr/lib/libvorbisfile.so
|
||||
usr/lib/libvorbisfile.so.3
|
||||
usr/lib/libvorbisfile.so.3.3.2
|
||||
usr/lib/libvorbisfile.so.3.3.5
|
||||
#usr/lib/pkgconfig/vorbis.pc
|
||||
#usr/lib/pkgconfig/vorbisenc.pc
|
||||
#usr/lib/pkgconfig/vorbisfile.pc
|
||||
#usr/share/aclocal/vorbis.m4
|
||||
#usr/share/doc/libvorbis-1.2.3
|
||||
#usr/share/doc/libvorbis-1.2.3/Vorbis_I_spec.cfg
|
||||
#usr/share/doc/libvorbis-1.2.3/Vorbis_I_spec.css
|
||||
#usr/share/doc/libvorbis-1.2.3/Vorbis_I_spec.html
|
||||
#usr/share/doc/libvorbis-1.2.3/Vorbis_I_spec.pdf
|
||||
#usr/share/doc/libvorbis-1.2.3/Vorbis_I_spec.tex
|
||||
#usr/share/doc/libvorbis-1.2.3/eightphase.png
|
||||
#usr/share/doc/libvorbis-1.2.3/evenlsp.png
|
||||
#usr/share/doc/libvorbis-1.2.3/fish_xiph_org.png
|
||||
#usr/share/doc/libvorbis-1.2.3/floor1_inverse_dB_table.html
|
||||
#usr/share/doc/libvorbis-1.2.3/floorval.png
|
||||
#usr/share/doc/libvorbis-1.2.3/fourphase.png
|
||||
#usr/share/doc/libvorbis-1.2.3/framing.html
|
||||
#usr/share/doc/libvorbis-1.2.3/helper.html
|
||||
#usr/share/doc/libvorbis-1.2.3/index.html
|
||||
#usr/share/doc/libvorbis-1.2.3/lspmap.png
|
||||
#usr/share/doc/libvorbis-1.2.3/oddlsp.png
|
||||
#usr/share/doc/libvorbis-1.2.3/oggstream.html
|
||||
#usr/share/doc/libvorbis-1.2.3/programming.html
|
||||
#usr/share/doc/libvorbis-1.2.3/rfc5215.txt
|
||||
#usr/share/doc/libvorbis-1.2.3/rfc5215.xml
|
||||
#usr/share/doc/libvorbis-1.2.3/squarepolar.png
|
||||
#usr/share/doc/libvorbis-1.2.3/stereo.html
|
||||
#usr/share/doc/libvorbis-1.2.3/stream.png
|
||||
#usr/share/doc/libvorbis-1.2.3/v-comment.html
|
||||
#usr/share/doc/libvorbis-1.2.3/vorbis-clip.txt
|
||||
#usr/share/doc/libvorbis-1.2.3/vorbis-errors.txt
|
||||
#usr/share/doc/libvorbis-1.2.3/vorbis-fidelity.html
|
||||
#usr/share/doc/libvorbis-1.2.3/vorbis.html
|
||||
#usr/share/doc/libvorbis-1.2.3/vorbisenc
|
||||
#usr/share/doc/libvorbis-1.2.3/vorbisenc/changes.html
|
||||
#usr/share/doc/libvorbis-1.2.3/vorbisenc/examples.html
|
||||
#usr/share/doc/libvorbis-1.2.3/vorbisenc/index.html
|
||||
#usr/share/doc/libvorbis-1.2.3/vorbisenc/ov_ectl_ratemanage2_arg.html
|
||||
#usr/share/doc/libvorbis-1.2.3/vorbisenc/ov_ectl_ratemanage_arg.html
|
||||
#usr/share/doc/libvorbis-1.2.3/vorbisenc/overview.html
|
||||
#usr/share/doc/libvorbis-1.2.3/vorbisenc/reference.html
|
||||
#usr/share/doc/libvorbis-1.2.3/vorbisenc/style.css
|
||||
#usr/share/doc/libvorbis-1.2.3/vorbisenc/vorbis_encode_ctl.html
|
||||
#usr/share/doc/libvorbis-1.2.3/vorbisenc/vorbis_encode_init.html
|
||||
#usr/share/doc/libvorbis-1.2.3/vorbisenc/vorbis_encode_init_vbr.html
|
||||
#usr/share/doc/libvorbis-1.2.3/vorbisenc/vorbis_encode_setup_init.html
|
||||
#usr/share/doc/libvorbis-1.2.3/vorbisenc/vorbis_encode_setup_managed.html
|
||||
#usr/share/doc/libvorbis-1.2.3/vorbisenc/vorbis_encode_setup_vbr.html
|
||||
#usr/share/doc/libvorbis-1.2.3/vorbisenc/vorbis_info.html
|
||||
#usr/share/doc/libvorbis-1.2.3/vorbisfile
|
||||
#usr/share/doc/libvorbis-1.2.3/vorbisfile/OggVorbis_File.html
|
||||
#usr/share/doc/libvorbis-1.2.3/vorbisfile/callbacks.html
|
||||
#usr/share/doc/libvorbis-1.2.3/vorbisfile/chaining_example_c.html
|
||||
#usr/share/doc/libvorbis-1.2.3/vorbisfile/chainingexample.html
|
||||
#usr/share/doc/libvorbis-1.2.3/vorbisfile/crosslap.html
|
||||
#usr/share/doc/libvorbis-1.2.3/vorbisfile/datastructures.html
|
||||
#usr/share/doc/libvorbis-1.2.3/vorbisfile/decoding.html
|
||||
#usr/share/doc/libvorbis-1.2.3/vorbisfile/example.html
|
||||
#usr/share/doc/libvorbis-1.2.3/vorbisfile/exampleindex.html
|
||||
#usr/share/doc/libvorbis-1.2.3/vorbisfile/fileinfo.html
|
||||
#usr/share/doc/libvorbis-1.2.3/vorbisfile/index.html
|
||||
#usr/share/doc/libvorbis-1.2.3/vorbisfile/initialization.html
|
||||
#usr/share/doc/libvorbis-1.2.3/vorbisfile/ov_bitrate.html
|
||||
#usr/share/doc/libvorbis-1.2.3/vorbisfile/ov_bitrate_instant.html
|
||||
#usr/share/doc/libvorbis-1.2.3/vorbisfile/ov_callbacks.html
|
||||
#usr/share/doc/libvorbis-1.2.3/vorbisfile/ov_clear.html
|
||||
#usr/share/doc/libvorbis-1.2.3/vorbisfile/ov_comment.html
|
||||
#usr/share/doc/libvorbis-1.2.3/vorbisfile/ov_crosslap.html
|
||||
#usr/share/doc/libvorbis-1.2.3/vorbisfile/ov_fopen.html
|
||||
#usr/share/doc/libvorbis-1.2.3/vorbisfile/ov_info.html
|
||||
#usr/share/doc/libvorbis-1.2.3/vorbisfile/ov_open.html
|
||||
#usr/share/doc/libvorbis-1.2.3/vorbisfile/ov_open_callbacks.html
|
||||
#usr/share/doc/libvorbis-1.2.3/vorbisfile/ov_pcm_seek.html
|
||||
#usr/share/doc/libvorbis-1.2.3/vorbisfile/ov_pcm_seek_lap.html
|
||||
#usr/share/doc/libvorbis-1.2.3/vorbisfile/ov_pcm_seek_page.html
|
||||
#usr/share/doc/libvorbis-1.2.3/vorbisfile/ov_pcm_seek_page_lap.html
|
||||
#usr/share/doc/libvorbis-1.2.3/vorbisfile/ov_pcm_tell.html
|
||||
#usr/share/doc/libvorbis-1.2.3/vorbisfile/ov_pcm_total.html
|
||||
#usr/share/doc/libvorbis-1.2.3/vorbisfile/ov_raw_seek.html
|
||||
#usr/share/doc/libvorbis-1.2.3/vorbisfile/ov_raw_seek_lap.html
|
||||
#usr/share/doc/libvorbis-1.2.3/vorbisfile/ov_raw_tell.html
|
||||
#usr/share/doc/libvorbis-1.2.3/vorbisfile/ov_raw_total.html
|
||||
#usr/share/doc/libvorbis-1.2.3/vorbisfile/ov_read.html
|
||||
#usr/share/doc/libvorbis-1.2.3/vorbisfile/ov_read_float.html
|
||||
#usr/share/doc/libvorbis-1.2.3/vorbisfile/ov_seekable.html
|
||||
#usr/share/doc/libvorbis-1.2.3/vorbisfile/ov_serialnumber.html
|
||||
#usr/share/doc/libvorbis-1.2.3/vorbisfile/ov_streams.html
|
||||
#usr/share/doc/libvorbis-1.2.3/vorbisfile/ov_test.html
|
||||
#usr/share/doc/libvorbis-1.2.3/vorbisfile/ov_test_callbacks.html
|
||||
#usr/share/doc/libvorbis-1.2.3/vorbisfile/ov_test_open.html
|
||||
#usr/share/doc/libvorbis-1.2.3/vorbisfile/ov_time_seek.html
|
||||
#usr/share/doc/libvorbis-1.2.3/vorbisfile/ov_time_seek_lap.html
|
||||
#usr/share/doc/libvorbis-1.2.3/vorbisfile/ov_time_seek_page.html
|
||||
#usr/share/doc/libvorbis-1.2.3/vorbisfile/ov_time_seek_page_lap.html
|
||||
#usr/share/doc/libvorbis-1.2.3/vorbisfile/ov_time_tell.html
|
||||
#usr/share/doc/libvorbis-1.2.3/vorbisfile/ov_time_total.html
|
||||
#usr/share/doc/libvorbis-1.2.3/vorbisfile/overview.html
|
||||
#usr/share/doc/libvorbis-1.2.3/vorbisfile/reference.html
|
||||
#usr/share/doc/libvorbis-1.2.3/vorbisfile/return.html
|
||||
#usr/share/doc/libvorbis-1.2.3/vorbisfile/seekexample.html
|
||||
#usr/share/doc/libvorbis-1.2.3/vorbisfile/seeking.html
|
||||
#usr/share/doc/libvorbis-1.2.3/vorbisfile/seeking_example_c.html
|
||||
#usr/share/doc/libvorbis-1.2.3/vorbisfile/seeking_test_c.html
|
||||
#usr/share/doc/libvorbis-1.2.3/vorbisfile/seekingexample.html
|
||||
#usr/share/doc/libvorbis-1.2.3/vorbisfile/style.css
|
||||
#usr/share/doc/libvorbis-1.2.3/vorbisfile/threads.html
|
||||
#usr/share/doc/libvorbis-1.2.3/vorbisfile/vorbis_comment.html
|
||||
#usr/share/doc/libvorbis-1.2.3/vorbisfile/vorbis_info.html
|
||||
#usr/share/doc/libvorbis-1.2.3/vorbisfile/vorbisfile_example_c.html
|
||||
#usr/share/doc/libvorbis-1.2.3/vorbisword2.png
|
||||
#usr/share/doc/libvorbis-1.2.3/wait.png
|
||||
#usr/share/doc/libvorbis-1.2.3/white-xifish.png
|
||||
#usr/share/doc/libvorbis-1.3.3
|
||||
#usr/share/doc/libvorbis-1.3.3/doxygen-build.stamp
|
||||
#usr/share/doc/libvorbis-1.3.3/eightphase.png
|
||||
#usr/share/doc/libvorbis-1.3.3/evenlsp.png
|
||||
#usr/share/doc/libvorbis-1.3.3/fish_xiph_org.png
|
||||
#usr/share/doc/libvorbis-1.3.3/floor1_inverse_dB_table.html
|
||||
#usr/share/doc/libvorbis-1.3.3/floorval.png
|
||||
#usr/share/doc/libvorbis-1.3.3/fourphase.png
|
||||
#usr/share/doc/libvorbis-1.3.3/framing.html
|
||||
#usr/share/doc/libvorbis-1.3.3/helper.html
|
||||
#usr/share/doc/libvorbis-1.3.3/index.html
|
||||
#usr/share/doc/libvorbis-1.3.3/libvorbis
|
||||
#usr/share/doc/libvorbis-1.3.3/libvorbis/index.html
|
||||
#usr/share/doc/libvorbis-1.3.3/libvorbis/overview.html
|
||||
#usr/share/doc/libvorbis-1.3.3/libvorbis/reference.html
|
||||
#usr/share/doc/libvorbis-1.3.3/libvorbis/return.html
|
||||
#usr/share/doc/libvorbis-1.3.3/libvorbis/style.css
|
||||
#usr/share/doc/libvorbis-1.3.3/libvorbis/vorbis_analysis.html
|
||||
#usr/share/doc/libvorbis-1.3.3/libvorbis/vorbis_analysis_blockout.html
|
||||
#usr/share/doc/libvorbis-1.3.3/libvorbis/vorbis_analysis_buffer.html
|
||||
#usr/share/doc/libvorbis-1.3.3/libvorbis/vorbis_analysis_headerout.html
|
||||
#usr/share/doc/libvorbis-1.3.3/libvorbis/vorbis_analysis_init.html
|
||||
#usr/share/doc/libvorbis-1.3.3/libvorbis/vorbis_analysis_wrote.html
|
||||
#usr/share/doc/libvorbis-1.3.3/libvorbis/vorbis_bitrate_addblock.html
|
||||
#usr/share/doc/libvorbis-1.3.3/libvorbis/vorbis_bitrate_flushpacket.html
|
||||
#usr/share/doc/libvorbis-1.3.3/libvorbis/vorbis_block.html
|
||||
#usr/share/doc/libvorbis-1.3.3/libvorbis/vorbis_block_clear.html
|
||||
#usr/share/doc/libvorbis-1.3.3/libvorbis/vorbis_block_init.html
|
||||
#usr/share/doc/libvorbis-1.3.3/libvorbis/vorbis_comment.html
|
||||
#usr/share/doc/libvorbis-1.3.3/libvorbis/vorbis_comment_add.html
|
||||
#usr/share/doc/libvorbis-1.3.3/libvorbis/vorbis_comment_add_tag.html
|
||||
#usr/share/doc/libvorbis-1.3.3/libvorbis/vorbis_comment_clear.html
|
||||
#usr/share/doc/libvorbis-1.3.3/libvorbis/vorbis_comment_init.html
|
||||
#usr/share/doc/libvorbis-1.3.3/libvorbis/vorbis_comment_query.html
|
||||
#usr/share/doc/libvorbis-1.3.3/libvorbis/vorbis_comment_query_count.html
|
||||
#usr/share/doc/libvorbis-1.3.3/libvorbis/vorbis_commentheader_out.html
|
||||
#usr/share/doc/libvorbis-1.3.3/libvorbis/vorbis_dsp_clear.html
|
||||
#usr/share/doc/libvorbis-1.3.3/libvorbis/vorbis_dsp_state.html
|
||||
#usr/share/doc/libvorbis-1.3.3/libvorbis/vorbis_granule_time.html
|
||||
#usr/share/doc/libvorbis-1.3.3/libvorbis/vorbis_info.html
|
||||
#usr/share/doc/libvorbis-1.3.3/libvorbis/vorbis_info_blocksize.html
|
||||
#usr/share/doc/libvorbis-1.3.3/libvorbis/vorbis_info_clear.html
|
||||
#usr/share/doc/libvorbis-1.3.3/libvorbis/vorbis_info_init.html
|
||||
#usr/share/doc/libvorbis-1.3.3/libvorbis/vorbis_packet_blocksize.html
|
||||
#usr/share/doc/libvorbis-1.3.3/libvorbis/vorbis_synthesis.html
|
||||
#usr/share/doc/libvorbis-1.3.3/libvorbis/vorbis_synthesis_blockin.html
|
||||
#usr/share/doc/libvorbis-1.3.3/libvorbis/vorbis_synthesis_halfrate.html
|
||||
#usr/share/doc/libvorbis-1.3.3/libvorbis/vorbis_synthesis_halfrate_p.html
|
||||
#usr/share/doc/libvorbis-1.3.3/libvorbis/vorbis_synthesis_headerin.html
|
||||
#usr/share/doc/libvorbis-1.3.3/libvorbis/vorbis_synthesis_idheader.html
|
||||
#usr/share/doc/libvorbis-1.3.3/libvorbis/vorbis_synthesis_init.html
|
||||
#usr/share/doc/libvorbis-1.3.3/libvorbis/vorbis_synthesis_lapout.html
|
||||
#usr/share/doc/libvorbis-1.3.3/libvorbis/vorbis_synthesis_pcmout.html
|
||||
#usr/share/doc/libvorbis-1.3.3/libvorbis/vorbis_synthesis_read.html
|
||||
#usr/share/doc/libvorbis-1.3.3/libvorbis/vorbis_synthesis_restart.html
|
||||
#usr/share/doc/libvorbis-1.3.3/libvorbis/vorbis_synthesis_trackonly.html
|
||||
#usr/share/doc/libvorbis-1.3.3/libvorbis/vorbis_version_string.html
|
||||
#usr/share/doc/libvorbis-1.3.3/lspmap.png
|
||||
#usr/share/doc/libvorbis-1.3.3/oddlsp.png
|
||||
#usr/share/doc/libvorbis-1.3.3/oggstream.html
|
||||
#usr/share/doc/libvorbis-1.3.3/programming.html
|
||||
#usr/share/doc/libvorbis-1.3.3/rfc5215.txt
|
||||
#usr/share/doc/libvorbis-1.3.3/rfc5215.xml
|
||||
#usr/share/doc/libvorbis-1.3.3/squarepolar.png
|
||||
#usr/share/doc/libvorbis-1.3.3/stereo.html
|
||||
#usr/share/doc/libvorbis-1.3.3/stream.png
|
||||
#usr/share/doc/libvorbis-1.3.3/v-comment.html
|
||||
#usr/share/doc/libvorbis-1.3.3/vorbis-clip.txt
|
||||
#usr/share/doc/libvorbis-1.3.3/vorbis-errors.txt
|
||||
#usr/share/doc/libvorbis-1.3.3/vorbis-fidelity.html
|
||||
#usr/share/doc/libvorbis-1.3.3/vorbis.html
|
||||
#usr/share/doc/libvorbis-1.3.3/vorbisenc
|
||||
#usr/share/doc/libvorbis-1.3.3/vorbisenc/changes.html
|
||||
#usr/share/doc/libvorbis-1.3.3/vorbisenc/examples.html
|
||||
#usr/share/doc/libvorbis-1.3.3/vorbisenc/index.html
|
||||
#usr/share/doc/libvorbis-1.3.3/vorbisenc/ovectl_ratemanage2_arg.html
|
||||
#usr/share/doc/libvorbis-1.3.3/vorbisenc/ovectl_ratemanage_arg.html
|
||||
#usr/share/doc/libvorbis-1.3.3/vorbisenc/overview.html
|
||||
#usr/share/doc/libvorbis-1.3.3/vorbisenc/reference.html
|
||||
#usr/share/doc/libvorbis-1.3.3/vorbisenc/style.css
|
||||
#usr/share/doc/libvorbis-1.3.3/vorbisenc/vorbis_encode_ctl.html
|
||||
#usr/share/doc/libvorbis-1.3.3/vorbisenc/vorbis_encode_init.html
|
||||
#usr/share/doc/libvorbis-1.3.3/vorbisenc/vorbis_encode_init_vbr.html
|
||||
#usr/share/doc/libvorbis-1.3.3/vorbisenc/vorbis_encode_setup_init.html
|
||||
#usr/share/doc/libvorbis-1.3.3/vorbisenc/vorbis_encode_setup_managed.html
|
||||
#usr/share/doc/libvorbis-1.3.3/vorbisenc/vorbis_encode_setup_vbr.html
|
||||
#usr/share/doc/libvorbis-1.3.3/vorbisfile
|
||||
#usr/share/doc/libvorbis-1.3.3/vorbisfile/OggVorbis_File.html
|
||||
#usr/share/doc/libvorbis-1.3.3/vorbisfile/callbacks.html
|
||||
#usr/share/doc/libvorbis-1.3.3/vorbisfile/chaining_example_c.html
|
||||
#usr/share/doc/libvorbis-1.3.3/vorbisfile/chainingexample.html
|
||||
#usr/share/doc/libvorbis-1.3.3/vorbisfile/crosslap.html
|
||||
#usr/share/doc/libvorbis-1.3.3/vorbisfile/datastructures.html
|
||||
#usr/share/doc/libvorbis-1.3.3/vorbisfile/decoding.html
|
||||
#usr/share/doc/libvorbis-1.3.3/vorbisfile/example.html
|
||||
#usr/share/doc/libvorbis-1.3.3/vorbisfile/exampleindex.html
|
||||
#usr/share/doc/libvorbis-1.3.3/vorbisfile/fileinfo.html
|
||||
#usr/share/doc/libvorbis-1.3.3/vorbisfile/index.html
|
||||
#usr/share/doc/libvorbis-1.3.3/vorbisfile/initialization.html
|
||||
#usr/share/doc/libvorbis-1.3.3/vorbisfile/ov_bitrate.html
|
||||
#usr/share/doc/libvorbis-1.3.3/vorbisfile/ov_bitrate_instant.html
|
||||
#usr/share/doc/libvorbis-1.3.3/vorbisfile/ov_callbacks.html
|
||||
#usr/share/doc/libvorbis-1.3.3/vorbisfile/ov_clear.html
|
||||
#usr/share/doc/libvorbis-1.3.3/vorbisfile/ov_comment.html
|
||||
#usr/share/doc/libvorbis-1.3.3/vorbisfile/ov_crosslap.html
|
||||
#usr/share/doc/libvorbis-1.3.3/vorbisfile/ov_fopen.html
|
||||
#usr/share/doc/libvorbis-1.3.3/vorbisfile/ov_info.html
|
||||
#usr/share/doc/libvorbis-1.3.3/vorbisfile/ov_open.html
|
||||
#usr/share/doc/libvorbis-1.3.3/vorbisfile/ov_open_callbacks.html
|
||||
#usr/share/doc/libvorbis-1.3.3/vorbisfile/ov_pcm_seek.html
|
||||
#usr/share/doc/libvorbis-1.3.3/vorbisfile/ov_pcm_seek_lap.html
|
||||
#usr/share/doc/libvorbis-1.3.3/vorbisfile/ov_pcm_seek_page.html
|
||||
#usr/share/doc/libvorbis-1.3.3/vorbisfile/ov_pcm_seek_page_lap.html
|
||||
#usr/share/doc/libvorbis-1.3.3/vorbisfile/ov_pcm_tell.html
|
||||
#usr/share/doc/libvorbis-1.3.3/vorbisfile/ov_pcm_total.html
|
||||
#usr/share/doc/libvorbis-1.3.3/vorbisfile/ov_raw_seek.html
|
||||
#usr/share/doc/libvorbis-1.3.3/vorbisfile/ov_raw_seek_lap.html
|
||||
#usr/share/doc/libvorbis-1.3.3/vorbisfile/ov_raw_tell.html
|
||||
#usr/share/doc/libvorbis-1.3.3/vorbisfile/ov_raw_total.html
|
||||
#usr/share/doc/libvorbis-1.3.3/vorbisfile/ov_read.html
|
||||
#usr/share/doc/libvorbis-1.3.3/vorbisfile/ov_read_filter.html
|
||||
#usr/share/doc/libvorbis-1.3.3/vorbisfile/ov_read_float.html
|
||||
#usr/share/doc/libvorbis-1.3.3/vorbisfile/ov_seekable.html
|
||||
#usr/share/doc/libvorbis-1.3.3/vorbisfile/ov_serialnumber.html
|
||||
#usr/share/doc/libvorbis-1.3.3/vorbisfile/ov_streams.html
|
||||
#usr/share/doc/libvorbis-1.3.3/vorbisfile/ov_test.html
|
||||
#usr/share/doc/libvorbis-1.3.3/vorbisfile/ov_test_callbacks.html
|
||||
#usr/share/doc/libvorbis-1.3.3/vorbisfile/ov_test_open.html
|
||||
#usr/share/doc/libvorbis-1.3.3/vorbisfile/ov_time_seek.html
|
||||
#usr/share/doc/libvorbis-1.3.3/vorbisfile/ov_time_seek_lap.html
|
||||
#usr/share/doc/libvorbis-1.3.3/vorbisfile/ov_time_seek_page.html
|
||||
#usr/share/doc/libvorbis-1.3.3/vorbisfile/ov_time_seek_page_lap.html
|
||||
#usr/share/doc/libvorbis-1.3.3/vorbisfile/ov_time_tell.html
|
||||
#usr/share/doc/libvorbis-1.3.3/vorbisfile/ov_time_total.html
|
||||
#usr/share/doc/libvorbis-1.3.3/vorbisfile/overview.html
|
||||
#usr/share/doc/libvorbis-1.3.3/vorbisfile/reference.html
|
||||
#usr/share/doc/libvorbis-1.3.3/vorbisfile/seekexample.html
|
||||
#usr/share/doc/libvorbis-1.3.3/vorbisfile/seeking.html
|
||||
#usr/share/doc/libvorbis-1.3.3/vorbisfile/seeking_example_c.html
|
||||
#usr/share/doc/libvorbis-1.3.3/vorbisfile/seeking_test_c.html
|
||||
#usr/share/doc/libvorbis-1.3.3/vorbisfile/seekingexample.html
|
||||
#usr/share/doc/libvorbis-1.3.3/vorbisfile/style.css
|
||||
#usr/share/doc/libvorbis-1.3.3/vorbisfile/threads.html
|
||||
#usr/share/doc/libvorbis-1.3.3/vorbisfile/vorbisfile_example_c.html
|
||||
#usr/share/doc/libvorbis-1.3.3/vorbisword2.png
|
||||
#usr/share/doc/libvorbis-1.3.3/wait.png
|
||||
#usr/share/doc/libvorbis-1.3.3/white-xifish.png
|
||||
|
||||
@@ -76,6 +76,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
|
||||
cd $(DIR_APP)/capiinit && make install
|
||||
cd $(DIR_APP)/capi20 && sed -i -e 's/include <linux\/capi.h>/include <linux\/types.h>\n#include <linux\/capi.h>/' capidyn.c
|
||||
cd $(DIR_APP)/capi20 && sed -i -e 's/include <linux\/capi.h>/include <linux\/types.h>\n#include <linux\/capi.h>/' capi20.c
|
||||
cd $(DIR_APP)/capi20 && sed -i "/include/a #include <stddef.h>" capi20.h
|
||||
cd $(DIR_APP)/capi20 && sed -i -e 's/-O2/$(CFLAGS)/' configure
|
||||
cd $(DIR_APP)/capi20 && SED=sed ./configure
|
||||
cd $(DIR_APP)/capi20 && SED=sed make $(MAKETUNING)
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
|
||||
include Config
|
||||
|
||||
VER = 3.1.6
|
||||
VER = 3.1.7
|
||||
|
||||
THISAPP = ccache-$(VER)
|
||||
DL_FILE = $(THISAPP).tar.bz2
|
||||
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
|
||||
|
||||
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
|
||||
|
||||
$(DL_FILE)_MD5 = 343dc9b642e1d2af1e6bd8e474dde92e
|
||||
$(DL_FILE)_MD5 = 82257745eac54826527946e9e3d046f4
|
||||
|
||||
install : $(TARGET)
|
||||
|
||||
@@ -70,8 +70,7 @@ $(subst %,%_MD5,$(objects)) :
|
||||
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
|
||||
@$(PREBUILD)
|
||||
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
|
||||
cd $(DIR_APP) && patch -p1 < $(DIR_SRC)/src/patches/$(THISAPP)-no_compiler_mtime.patch
|
||||
cd $(DIR_APP) && CFLAGS="-O2 -static -DDEFAULT_MAXSIZE=2097152" ./configure --prefix=$(ROOT)/usr/local
|
||||
cd $(DIR_APP) && CFLAGS="-O2 -static -DDEFAULT_MAXSIZE=5242880" ./configure --prefix=$(ROOT)/usr/local
|
||||
cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
|
||||
cd $(DIR_APP) && make install
|
||||
ln -sf ccache $(ROOT)/usr/local/bin/gcc
|
||||
|
||||
1
lfs/dbus
1
lfs/dbus
@@ -77,6 +77,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
|
||||
@$(PREBUILD)
|
||||
@rm -rf $(DIR_SRC)/dbus*
|
||||
cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
|
||||
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/dbus-1.0.3-compile-fix-1.patch
|
||||
cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc \
|
||||
--localstatedir=/var
|
||||
cd $(DIR_APP) && make $(MAKETUNING)
|
||||
|
||||
76
lfs/hddtemp
76
lfs/hddtemp
@@ -1,76 +0,0 @@
|
||||
###############################################################################
|
||||
# #
|
||||
# IPFire.org - A linux based firewall #
|
||||
# Copyright (C) 2007 Michael Tremer & Christian Schmidt #
|
||||
# #
|
||||
# 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 #
|
||||
# (at your option) 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 <http://www.gnu.org/licenses/>. #
|
||||
# #
|
||||
###############################################################################
|
||||
|
||||
###############################################################################
|
||||
# Definitions
|
||||
###############################################################################
|
||||
|
||||
include Config
|
||||
|
||||
VER = 0.3-beta14
|
||||
|
||||
THISAPP = hddtemp-$(VER)
|
||||
DL_FILE = $(THISAPP).tar.bz2
|
||||
DL_FROM = $(URL_IPFIRE)
|
||||
DIR_APP = $(DIR_SRC)/$(THISAPP)
|
||||
TARGET = $(DIR_INFO)/$(THISAPP)
|
||||
|
||||
###############################################################################
|
||||
# Top-level Rules
|
||||
###############################################################################
|
||||
|
||||
objects = $(DL_FILE)
|
||||
|
||||
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
|
||||
|
||||
$(DL_FILE)_MD5 = bbf8be4539495e18bec54af77511a680
|
||||
|
||||
install : $(TARGET)
|
||||
|
||||
check : $(patsubst %,$(DIR_CHK)/%,$(objects))
|
||||
|
||||
download :$(patsubst %,$(DIR_DL)/%,$(objects))
|
||||
|
||||
md5 : $(subst %,%_MD5,$(objects))
|
||||
|
||||
###############################################################################
|
||||
# Downloading, checking, md5sum
|
||||
###############################################################################
|
||||
|
||||
$(patsubst %,$(DIR_CHK)/%,$(objects)) :
|
||||
@$(CHECK)
|
||||
|
||||
$(patsubst %,$(DIR_DL)/%,$(objects)) :
|
||||
@$(LOAD)
|
||||
|
||||
$(subst %,%_MD5,$(objects)) :
|
||||
@$(MD5)
|
||||
|
||||
###############################################################################
|
||||
# Installation Details
|
||||
###############################################################################
|
||||
|
||||
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
|
||||
@$(PREBUILD)
|
||||
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
|
||||
cd $(DIR_APP) && ./configure --prefix=/usr --with-db-path=/etc/hddtemp.db
|
||||
cd $(DIR_APP) && make $(MAKETUNING) && make install
|
||||
@rm -rf $(DIR_APP)
|
||||
@$(POSTBUILD)
|
||||
@@ -77,6 +77,7 @@ $(subst %,%_MD5,$(objects)) :
|
||||
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
|
||||
@$(PREBUILD)
|
||||
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
|
||||
cd $(DIR_SRC)/imspector && sed -e "s/^SSL_LIBS.*/& -lcrypto/" -i Makefile
|
||||
cd $(DIR_SRC)/imspector && make install
|
||||
-mv /usr/etc/imspector /etc/imspector
|
||||
-mv /etc/imspector/imspector /etc/imspector
|
||||
|
||||
10
lfs/libogg
10
lfs/libogg
@@ -24,15 +24,15 @@
|
||||
|
||||
include Config
|
||||
|
||||
VER = 1.1.4
|
||||
VER = 1.3.0
|
||||
|
||||
THISAPP = libogg-$(VER)
|
||||
DL_FILE = $(THISAPP).tar.gz
|
||||
DL_FILE = $(THISAPP).tar.xz
|
||||
DL_FROM = $(URL_IPFIRE)
|
||||
DIR_APP = $(DIR_SRC)/$(THISAPP)
|
||||
TARGET = $(DIR_INFO)/$(THISAPP)
|
||||
PROG = libogg
|
||||
PAK_VER = 2
|
||||
PAK_VER = 3
|
||||
|
||||
DEPS = ""
|
||||
|
||||
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
|
||||
|
||||
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
|
||||
|
||||
$(DL_FILE)_MD5 = 10200ec22543841d9d1c23e0aed4e5e9
|
||||
$(DL_FILE)_MD5 = 84a35715170f2cd4c77a4448772b95d5
|
||||
|
||||
install : $(TARGET)
|
||||
|
||||
@@ -76,7 +76,7 @@ $(subst %,%_MD5,$(objects)) :
|
||||
|
||||
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
|
||||
@$(PREBUILD)
|
||||
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
|
||||
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
|
||||
cd $(DIR_APP) && ./configure --prefix=/usr
|
||||
cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
|
||||
cd $(DIR_APP) && make install
|
||||
|
||||
78
lfs/libsafe
78
lfs/libsafe
@@ -1,78 +0,0 @@
|
||||
###############################################################################
|
||||
# #
|
||||
# IPFire.org - A linux based firewall #
|
||||
# Copyright (C) 2007 Michael Tremer & Christian Schmidt #
|
||||
# #
|
||||
# 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 #
|
||||
# (at your option) 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 <http://www.gnu.org/licenses/>. #
|
||||
# #
|
||||
###############################################################################
|
||||
|
||||
###############################################################################
|
||||
# Definitions
|
||||
###############################################################################
|
||||
|
||||
include Config
|
||||
|
||||
VER = 2.0-16
|
||||
|
||||
THISAPP = libsafe_$(VER)
|
||||
DL_FILE = $(THISAPP).orig.tar.gz
|
||||
DL_FROM = $(URL_IPFIRE)
|
||||
DIR_APP = $(DIR_SRC)/libsafe-$(VER)
|
||||
TARGET = $(DIR_INFO)/$(THISAPP)
|
||||
|
||||
###############################################################################
|
||||
# Top-level Rules
|
||||
###############################################################################
|
||||
|
||||
objects = $(DL_FILE)
|
||||
|
||||
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
|
||||
|
||||
$(DL_FILE)_MD5 = 6b7b6e6df84d4afb469ccc66d04fc24d
|
||||
|
||||
install : $(TARGET)
|
||||
|
||||
check : $(patsubst %,$(DIR_CHK)/%,$(objects))
|
||||
|
||||
download :$(patsubst %,$(DIR_DL)/%,$(objects))
|
||||
|
||||
md5 : $(subst %,%_MD5,$(objects))
|
||||
|
||||
###############################################################################
|
||||
# Downloading, checking, md5sum
|
||||
###############################################################################
|
||||
|
||||
$(patsubst %,$(DIR_CHK)/%,$(objects)) :
|
||||
@$(CHECK)
|
||||
|
||||
$(patsubst %,$(DIR_DL)/%,$(objects)) :
|
||||
@$(LOAD)
|
||||
|
||||
$(subst %,%_MD5,$(objects)) :
|
||||
@$(MD5)
|
||||
|
||||
###############################################################################
|
||||
# Installation Details
|
||||
###############################################################################
|
||||
|
||||
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
|
||||
@$(PREBUILD)
|
||||
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
|
||||
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/libsafe-functioncaching.diff
|
||||
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/libsafe-alpha.diff
|
||||
cd $(DIR_APP) && make libsafe $(MAKETUNING)
|
||||
cd $(DIR_APP) && yes | make install
|
||||
@rm -rf $(DIR_APP)
|
||||
@$(POSTBUILD)
|
||||
@@ -24,15 +24,15 @@
|
||||
|
||||
include Config
|
||||
|
||||
VER = 1.2.3
|
||||
VER = 1.3.3
|
||||
|
||||
THISAPP = libvorbis-$(VER)
|
||||
DL_FILE = $(THISAPP).tar.bz2
|
||||
DL_FILE = $(THISAPP).tar.xz
|
||||
DL_FROM = $(URL_IPFIRE)
|
||||
DIR_APP = $(DIR_SRC)/$(THISAPP)
|
||||
TARGET = $(DIR_INFO)/$(THISAPP)
|
||||
PROG = libvorbis
|
||||
PAK_VER = 3
|
||||
PAK_VER = 4
|
||||
|
||||
DEPS = "libogg"
|
||||
|
||||
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
|
||||
|
||||
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
|
||||
|
||||
$(DL_FILE)_MD5 = 67beb237faf97d74782ec7071756b2b6
|
||||
$(DL_FILE)_MD5 = 71b649d3e08e63ece16649df906ce8b9
|
||||
|
||||
install : $(TARGET)
|
||||
|
||||
@@ -76,11 +76,9 @@ $(subst %,%_MD5,$(objects)) :
|
||||
|
||||
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
|
||||
@$(PREBUILD)
|
||||
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
|
||||
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
|
||||
cd $(DIR_APP) && ./configure --prefix=/usr
|
||||
cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
|
||||
#cd $(DIR_APP) && sed -i.bak -e 's/-mno-ieee-fp//' lib/Makefile
|
||||
cd $(DIR_APP) && make install
|
||||
cd $(DIR_APP) && install -v -m644 doc/Vorbis* /usr/share/doc/libvorbis-1.2.3
|
||||
@rm -rf $(DIR_APP)
|
||||
@$(POSTBUILD)
|
||||
|
||||
@@ -77,6 +77,7 @@ $(subst %,%_MD5,$(objects)) :
|
||||
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
|
||||
@$(PREBUILD)
|
||||
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
|
||||
cd $(DIR_APP)/converter && patch -Np1 < $(DIR_SRC)/src/patches/netpbm-10.26.46-getline.patch
|
||||
cp $(DIR_SRC)/config/netpbm/Makefile.config $(DIR_APP)
|
||||
cd $(DIR_APP) && make
|
||||
cd $(DIR_APP) && make package PKGDIR=/usr/local/netpbm
|
||||
|
||||
6
lfs/qemu
6
lfs/qemu
@@ -78,12 +78,10 @@ $(subst %,%_MD5,$(objects)) :
|
||||
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
|
||||
@$(PREBUILD)
|
||||
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
|
||||
|
||||
cd $(DIR_APP) && sed -i -e 's|CFLAGS+="-march=i486"|CFLAGS+=""|g' configure
|
||||
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/qemu-0.15.0_missing_definitions_hack.patch
|
||||
|
||||
cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc \
|
||||
--target-list="i386-linux-user i386-softmmu arm-softmmu"
|
||||
--target-list="i386-linux-user i386-softmmu arm-softmmu" \
|
||||
--extra-cflags="$(CFLAGS)"
|
||||
cd $(DIR_APP) && make $(MAKETUNING)
|
||||
cd $(DIR_APP) && make install
|
||||
@rm -rf $(DIR_APP)
|
||||
|
||||
4
make.sh
4
make.sh
@@ -222,7 +222,7 @@ prepareenv() {
|
||||
# Run LFS static binary creation scripts one by one
|
||||
export CCACHE_DIR=$BASEDIR/ccache
|
||||
export CCACHE_COMPRESS=1
|
||||
export CCACHE_HASHDIR=1
|
||||
export CCACHE_COMPILERCHECK="none"
|
||||
|
||||
# Remove pre-install list of installed files in case user erase some files before rebuild
|
||||
rm -f $BASEDIR/build/usr/src/lsalr 2>/dev/null
|
||||
@@ -589,7 +589,6 @@ buildipfire() {
|
||||
ipfiremake traceroute
|
||||
ipfiremake vlan
|
||||
ipfiremake wireless
|
||||
ipfiremake libsafe
|
||||
ipfiremake pakfire
|
||||
ipfiremake spandsp
|
||||
ipfiremake lzo
|
||||
@@ -605,7 +604,6 @@ buildipfire() {
|
||||
ipfiremake wget
|
||||
ipfiremake bridge-utils
|
||||
ipfiremake screen
|
||||
ipfiremake hddtemp
|
||||
ipfiremake smartmontools
|
||||
ipfiremake htop
|
||||
# ipfiremake postfix # unknown system type linux 3.2.x
|
||||
|
||||
@@ -1,21 +0,0 @@
|
||||
diff -Naur ccache-3.1.org/ccache.c ccache-3.1/ccache.c
|
||||
--- ccache-3.1.org/ccache.c 2010-09-16 19:01:09.000000000 +0200
|
||||
+++ ccache-3.1/ccache.c 2010-10-21 21:41:08.000000000 +0200
|
||||
@@ -805,13 +805,16 @@
|
||||
*/
|
||||
compilercheck = getenv("CCACHE_COMPILERCHECK");
|
||||
if (!compilercheck) {
|
||||
- compilercheck = "mtime";
|
||||
+ compilercheck = "size";
|
||||
}
|
||||
if (str_eq(compilercheck, "none")) {
|
||||
/* Do nothing. */
|
||||
} else if (str_eq(compilercheck, "content")) {
|
||||
hash_delimiter(hash, "cc_content");
|
||||
hash_file(hash, args->argv[0]);
|
||||
+ } else if (str_eq(compilercheck, "size")) {
|
||||
+ hash_delimiter(hash, "cc_size");
|
||||
+ hash_int(hash, st.st_size);
|
||||
} else if (str_eq(compilercheck, "mtime")) {
|
||||
hash_delimiter(hash, "cc_mtime");
|
||||
hash_int(hash, st.st_size);
|
||||
11
src/patches/dbus-1.0.3-compile-fix-1.patch
Normal file
11
src/patches/dbus-1.0.3-compile-fix-1.patch
Normal file
@@ -0,0 +1,11 @@
|
||||
--- dbus-1.0.1.orig/dbus/dbus-sysdeps-unix.c 2009-01-01 03:50:33.000000000 +0200
|
||||
+++ dbus-1.0.1.orig/dbus/dbus-sysdeps-unix.c 2009-01-01 04:09:24.000000000 +0200
|
||||
@@ -992,7 +992,7 @@
|
||||
_dbus_verbose ("read credentials byte\n");
|
||||
|
||||
{
|
||||
-#ifdef SO_PEERCRED
|
||||
+#if defined(SO_PEERCRED) && defined(HAVE_GETPEERUCRED)
|
||||
struct ucred cr;
|
||||
int cr_len = sizeof (cr);
|
||||
|
||||
@@ -1,232 +0,0 @@
|
||||
--- libsafe-2.0-16-orig/src/intercept.c 2003-03-15 16:02:12.000000000 +0100
|
||||
+++ libsafe-2.0-16/src/intercept.c 2003-03-15 16:12:22.000000000 +0100
|
||||
@@ -165,7 +165,8 @@
|
||||
*/
|
||||
char *strcpy(char *dest, const char *src)
|
||||
{
|
||||
- size_t max_size, len;
|
||||
+ uint max_size;
|
||||
+ size_t len;
|
||||
|
||||
if (!real_memcpy)
|
||||
real_memcpy = (memcpy_t) getLibraryFunction("memcpy");
|
||||
@@ -196,7 +197,8 @@
|
||||
|
||||
char *strncpy(char *dest, const char *src, size_t n)
|
||||
{
|
||||
- size_t max_size, len;
|
||||
+ uint max_size;
|
||||
+ size_t len;
|
||||
|
||||
if (!real_strncpy)
|
||||
real_strncpy = (strncpy_t) getLibraryFunction("strncpy");
|
||||
@@ -219,7 +221,8 @@
|
||||
|
||||
char *stpcpy(char *dest, const char *src)
|
||||
{
|
||||
- size_t max_size, len;
|
||||
+ uint max_size;
|
||||
+ size_t len;
|
||||
|
||||
if (!real_memcpy)
|
||||
real_memcpy = (memcpy_t) getLibraryFunction("memcpy");
|
||||
@@ -251,7 +254,8 @@
|
||||
#ifndef MISSING_WCSNLEN
|
||||
wchar_t *wcscpy(wchar_t *dest, const wchar_t *src)
|
||||
{
|
||||
- size_t max_bytes, max_wchars, len;
|
||||
+ size_t max_wchars, len;
|
||||
+ uint max_bytes;
|
||||
|
||||
if (!real_wcscpy)
|
||||
real_wcscpy = (wcscpy_t) getLibraryFunction("wcscpy");
|
||||
@@ -291,7 +295,8 @@
|
||||
|
||||
wchar_t *wcpcpy(wchar_t *dest, const wchar_t *src)
|
||||
{
|
||||
- size_t max_bytes, max_wchars, len;
|
||||
+ size_t max_wchars, len;
|
||||
+ uint max_bytes;
|
||||
|
||||
if (!real_wcpcpy)
|
||||
real_wcpcpy = (wcpcpy_t) getLibraryFunction("wcpcpy");
|
||||
@@ -333,9 +338,15 @@
|
||||
/*
|
||||
* This is needed! See the strcpy() for the reason. -ab.
|
||||
*/
|
||||
-void *memcpy(void *dest, const void *src, size_t n)
|
||||
+void *memcpy(void *dest, const void *src, size_t hack)
|
||||
{
|
||||
- size_t max_size;
|
||||
+ /*
|
||||
+ * a size_t IS an unsigned long everywhere, though it sometimes
|
||||
+ * doesn't state so, making printf misinterpret it.
|
||||
+ */
|
||||
+ unsigned long n = hack;
|
||||
+ uint max_size;
|
||||
+
|
||||
|
||||
if (!real_memcpy)
|
||||
real_memcpy = (memcpy_t) getLibraryFunction("memcpy");
|
||||
@@ -344,11 +355,11 @@
|
||||
return real_memcpy(dest, src, n);
|
||||
|
||||
if ((max_size = _libsafe_stackVariableP(dest)) == 0) {
|
||||
- LOG(5, "memcpy(<heap var> , <src>, %d)\n", n);
|
||||
+ LOG(5, "memcpy(<heap var> , <src>, %ld)\n", n);
|
||||
return real_memcpy(dest, src, n);
|
||||
}
|
||||
|
||||
- LOG(4, "memcpy(<stack var> , <src>, %d) stack limit=%d)\n", n, max_size);
|
||||
+ LOG(4, "memcpy(<stack var> , <src>, %ld) stack limit=%d)\n", n, max_size);
|
||||
if (n > max_size)
|
||||
_libsafe_die("Overflow caused by memcpy()");
|
||||
return real_memcpy(dest, src, n);
|
||||
@@ -357,7 +368,7 @@
|
||||
|
||||
char *strcat(char *dest, const char *src)
|
||||
{
|
||||
- size_t max_size;
|
||||
+ uint max_size;
|
||||
uint dest_len, src_len;
|
||||
|
||||
if (!real_memcpy)
|
||||
@@ -388,7 +399,7 @@
|
||||
|
||||
char *strncat(char *dest, const char *src, size_t n)
|
||||
{
|
||||
- size_t max_size;
|
||||
+ uint max_size;
|
||||
uint dest_len, src_len;
|
||||
|
||||
if (!real_strncat)
|
||||
@@ -1008,12 +1019,31 @@
|
||||
if (is_printf_convspec[(int)*p]) {
|
||||
caddr_t addr;
|
||||
c++;
|
||||
+#if 0
|
||||
+ /*
|
||||
+ * cannot add va_list (ap here) with a number on alpha.
|
||||
+ * this is faster than the other method, and might be
|
||||
+ * a good idea to enable this on !alpha arch.
|
||||
+ */
|
||||
if (pnum) {
|
||||
addr = *((caddr_t*)(ap + (atoi(pnum)-1)*sizeof(char*)));
|
||||
}
|
||||
else {
|
||||
addr = *((caddr_t*)(ap + c*sizeof(char*)));
|
||||
}
|
||||
+#else
|
||||
+ {
|
||||
+ va_list apc;
|
||||
+ uint nb = c + 1;
|
||||
+
|
||||
+ va_copy(apc, ap);
|
||||
+ if (pnum)
|
||||
+ nb = atoi(pnum);
|
||||
+ addr = NULL;
|
||||
+ while (nb--)
|
||||
+ addr = va_arg(apc, caddr_t);
|
||||
+ }
|
||||
+#endif
|
||||
if (*p == 'n') {
|
||||
if (_libsafe_raVariableP((void *)(addr))) {
|
||||
_libsafe_die("printf(\"%%n\")");
|
||||
@@ -1172,12 +1202,32 @@
|
||||
if (is_printf_convspec[(int)*p]) {
|
||||
caddr_t addr;
|
||||
c++;
|
||||
+#if 0
|
||||
+ /*
|
||||
+ * cannot add va_list (ap here) with a number on alpha.
|
||||
+ * this is faster than the other method, and might be
|
||||
+ * a good idea to enable this on !alpha arch.
|
||||
+ */
|
||||
+
|
||||
if (pnum) {
|
||||
addr = *((caddr_t*)(ap + (atoi(pnum)-1)*sizeof(char*)));
|
||||
}
|
||||
else {
|
||||
addr = *((caddr_t*)(ap + c*sizeof(char*)));
|
||||
}
|
||||
+#else
|
||||
+ {
|
||||
+ va_list apc;
|
||||
+ uint nb = c + 1;
|
||||
+
|
||||
+ va_copy(apc, ap);
|
||||
+ if (pnum)
|
||||
+ nb = atoi(pnum);
|
||||
+ addr = NULL;
|
||||
+ while (nb--)
|
||||
+ addr = va_arg(apc, caddr_t);
|
||||
+ }
|
||||
+#endif
|
||||
if (*p == 'n') {
|
||||
if (_libsafe_raVariableP((void *)(addr))) {
|
||||
_libsafe_die("printf(\"%%n\")");
|
||||
@@ -1194,7 +1244,7 @@
|
||||
|
||||
int sprintf(char *str, const char *format, ...)
|
||||
{
|
||||
- size_t max_size;
|
||||
+ uint max_size;
|
||||
va_list ap;
|
||||
int res;
|
||||
|
||||
@@ -1242,7 +1292,7 @@
|
||||
|
||||
int snprintf(char *str, size_t size, const char *format, ...)
|
||||
{
|
||||
- size_t max_size;
|
||||
+ uint max_size;
|
||||
va_list ap;
|
||||
int res;
|
||||
|
||||
@@ -1288,7 +1338,7 @@
|
||||
|
||||
int vsprintf(char *str, const char *format, va_list ap)
|
||||
{
|
||||
- size_t max_size;
|
||||
+ uint max_size;
|
||||
int res;
|
||||
|
||||
if (!real_vsprintf)
|
||||
@@ -1325,7 +1375,7 @@
|
||||
|
||||
int vsnprintf(char *str, size_t size, const char *format, va_list ap)
|
||||
{
|
||||
- size_t max_size;
|
||||
+ uint max_size;
|
||||
int res;
|
||||
|
||||
if (!real_vsnprintf)
|
||||
@@ -1360,7 +1410,7 @@
|
||||
|
||||
char *getwd(char *buf)
|
||||
{
|
||||
- size_t max_size;
|
||||
+ uint max_size;
|
||||
char *res;
|
||||
|
||||
if (!real_getwd)
|
||||
@@ -1384,7 +1434,8 @@
|
||||
|
||||
char *gets(char *s)
|
||||
{
|
||||
- size_t max_size, len;
|
||||
+ uint max_size;
|
||||
+ size_t len;
|
||||
|
||||
if (!real_gets)
|
||||
real_gets = (gets_t) getLibraryFunction("gets");
|
||||
@@ -1409,7 +1460,8 @@
|
||||
|
||||
char *realpath(char *path, char resolved_path[])
|
||||
{
|
||||
- size_t max_size, len;
|
||||
+ uint max_size;
|
||||
+ size_t len;
|
||||
char *res;
|
||||
char buf[MAXPATHLEN + 1];
|
||||
|
||||
@@ -1,258 +0,0 @@
|
||||
From: Goswin Brederlow <goswin.brederlow@student.uni-tuebingen.de>
|
||||
Subject: Bug#129345: patch to prevent a loop between libdl and libsafe causing libdl to crash
|
||||
To: 129345@bugs.debian.org
|
||||
Date: 01 Sep 2002 23:54:35 +0200
|
||||
Reply-To: Goswin Brederlow <goswin.brederlow@student.uni-tuebingen.de>,
|
||||
129345@bugs.debian.org
|
||||
Resent-From: Goswin Brederlow <goswin.brederlow@student.uni-tuebingen.de>
|
||||
|
||||
|
||||
-------
|
||||
[D. Coe edited this patch slightly -- moved an unrelated change into the
|
||||
Makefile itself [it changed the debugging comments only], and corrected a
|
||||
spelling error and reworded the comments. The original patch is in the
|
||||
bug tracking system, if you want to see it as submitted by Goswin.]
|
||||
-------
|
||||
-------
|
||||
D. Coe subsequently modified the patch further, because in some cases
|
||||
the initializations did not occur (e.g. when IO_vfscanf or memcpy was
|
||||
called from ps or top (likely one of the libraries they use). maybe
|
||||
they do something that disables libsafe's library globals initialization?
|
||||
|
||||
|
||||
In any case, I've adopted both strategise in this new patch; the addresses
|
||||
are preloaded as Goswin had coded, but they are also individually checked
|
||||
each time needed (as was the case before Goswin's patch), and are initialized
|
||||
at that point if necessary. Hopefully this will let ps and top work
|
||||
and also continue to work around the libdl problem.
|
||||
-------
|
||||
|
||||
Hi,
|
||||
|
||||
if libsafe is invoked from inside libdl (or only inside dlerror()?)
|
||||
and a real_XXX function is not yet looked up it will reenter
|
||||
libdl. That causes memory corruption resulting in a read from 0x0 and
|
||||
thus segfault.
|
||||
|
||||
The patch below makes libsafe cache all needed symbols once upon
|
||||
init. That not only causes less lookups than before but should prevent
|
||||
fatal loops. Failures of the initial lookups might not be reported
|
||||
correctly but terminate in some odd way if the functions needed to
|
||||
report are not yet looked up.
|
||||
|
||||
MfG
|
||||
Goswin
|
||||
|
||||
----------------------------------------------------------------------
|
||||
diff -Nurd libsafe-2.0-16/src/intercept.c libsafe-2.0-16-mrvn/src/intercept.c
|
||||
--- libsafe-2.0-16/src/intercept.c 2002-05-31 19:37:34.000000000 +0200
|
||||
+++ libsafe-2.0-16-mrvn/src/intercept.c 2002-09-01 23:44:55.000000000 +0200
|
||||
@@ -128,14 +128,29 @@
|
||||
}
|
||||
|
||||
|
||||
-/* Starting with version 2.0, we keep a single global copy of the pointer to
|
||||
- * the real memcpy() function. This allows us to call
|
||||
- * getLibraryFunction("memcpy") just once instead of multiple times, since
|
||||
- * memcpy() is needed in four different functions below.
|
||||
+/* Starting with Debian version 2.0-16-2, we keep a global copy of the pointer
|
||||
+ * to each real functions. Otherwise a getLibraryFunction might
|
||||
+ * be triggered from inside dlsym() and cause memory corruption reulting in a
|
||||
+ * segfault.
|
||||
*/
|
||||
-static memcpy_t real_memcpy = NULL;
|
||||
-
|
||||
-
|
||||
+static memcpy_t real_memcpy = NULL;
|
||||
+static _IO_vfscanf_t real_IO_vfscanf = NULL;
|
||||
+static vfprintf_t real_vfprintf = NULL;
|
||||
+static vsnprintf_t real_vsnprintf = NULL;
|
||||
+static vsprintf_t real_vsprintf = NULL;
|
||||
+static gets_t real_gets = NULL;
|
||||
+static getwd_t real_getwd = NULL;
|
||||
+static realpath_t real_realpath = NULL;
|
||||
+static stpcpy_t real_stpcpy = NULL;
|
||||
+static strcat_t real_strcat = NULL;
|
||||
+static strcpy_t real_strcpy = NULL;
|
||||
+static strncat_t real_strncat = NULL;
|
||||
+static strncpy_t real_strncpy = NULL;
|
||||
+static wcscpy_t real_wcscpy = NULL;
|
||||
+static wcpcpy_t real_wcpcpy = NULL;
|
||||
+#ifndef MISSING_WCSNLEN
|
||||
+static wcscat_t real_wcscat = NULL;
|
||||
+#endif
|
||||
/*
|
||||
* -------------- system library implementations -------------------
|
||||
* Here is the story: if a C source file includes <string.h> and is
|
||||
@@ -150,7 +165,6 @@
|
||||
*/
|
||||
char *strcpy(char *dest, const char *src)
|
||||
{
|
||||
- static strcpy_t real_strcpy = NULL;
|
||||
size_t max_size, len;
|
||||
|
||||
if (!real_memcpy)
|
||||
@@ -182,7 +196,6 @@
|
||||
|
||||
char *strncpy(char *dest, const char *src, size_t n)
|
||||
{
|
||||
- static strncpy_t real_strncpy = NULL;
|
||||
size_t max_size, len;
|
||||
|
||||
if (!real_strncpy)
|
||||
@@ -206,7 +219,6 @@
|
||||
|
||||
char *stpcpy(char *dest, const char *src)
|
||||
{
|
||||
- static stpcpy_t real_stpcpy = NULL;
|
||||
size_t max_size, len;
|
||||
|
||||
if (!real_memcpy)
|
||||
@@ -239,7 +251,6 @@
|
||||
#ifndef MISSING_WCSNLEN
|
||||
wchar_t *wcscpy(wchar_t *dest, const wchar_t *src)
|
||||
{
|
||||
- static wcscpy_t real_wcscpy = NULL;
|
||||
size_t max_bytes, max_wchars, len;
|
||||
|
||||
if (!real_wcscpy)
|
||||
@@ -280,7 +291,6 @@
|
||||
|
||||
wchar_t *wcpcpy(wchar_t *dest, const wchar_t *src)
|
||||
{
|
||||
- static wcpcpy_t real_wcpcpy = NULL;
|
||||
size_t max_bytes, max_wchars, len;
|
||||
|
||||
if (!real_wcpcpy)
|
||||
@@ -347,7 +357,6 @@
|
||||
|
||||
char *strcat(char *dest, const char *src)
|
||||
{
|
||||
- static strcat_t real_strcat = NULL;
|
||||
size_t max_size;
|
||||
uint dest_len, src_len;
|
||||
|
||||
@@ -379,7 +388,6 @@
|
||||
|
||||
char *strncat(char *dest, const char *src, size_t n)
|
||||
{
|
||||
- static strncat_t real_strncat = NULL;
|
||||
size_t max_size;
|
||||
uint dest_len, src_len;
|
||||
|
||||
@@ -408,7 +416,6 @@
|
||||
#ifndef MISSING_WCSNLEN
|
||||
wchar_t *wcscat(wchar_t *dest, const wchar_t *src)
|
||||
{
|
||||
- static wcscat_t real_wcscat = NULL;
|
||||
size_t max_bytes;
|
||||
uint dest_len, src_len;
|
||||
|
||||
@@ -861,7 +868,6 @@
|
||||
*/
|
||||
int vfprintf(FILE *fp, const char *format, va_list ap)
|
||||
{
|
||||
- static vfprintf_t real_vfprintf = NULL;
|
||||
int res;
|
||||
char *p, *pnum;
|
||||
int c = -1; /* Next var arg to be used */
|
||||
@@ -1026,7 +1032,6 @@
|
||||
*/
|
||||
int _IO_vfprintf(FILE *fp, const char *format, va_list ap)
|
||||
{
|
||||
- static vfprintf_t real_vfprintf = NULL;
|
||||
int res;
|
||||
char *p, *pnum;
|
||||
int c = -1; /* Next var arg to be used */
|
||||
@@ -1189,8 +1194,6 @@
|
||||
|
||||
int sprintf(char *str, const char *format, ...)
|
||||
{
|
||||
- static vsprintf_t real_vsprintf = NULL;
|
||||
- static vsnprintf_t real_vsnprintf = NULL;
|
||||
size_t max_size;
|
||||
va_list ap;
|
||||
int res;
|
||||
@@ -1239,7 +1242,6 @@
|
||||
|
||||
int snprintf(char *str, size_t size, const char *format, ...)
|
||||
{
|
||||
- static vsnprintf_t real_vsnprintf = NULL;
|
||||
size_t max_size;
|
||||
va_list ap;
|
||||
int res;
|
||||
@@ -1286,8 +1288,6 @@
|
||||
|
||||
int vsprintf(char *str, const char *format, va_list ap)
|
||||
{
|
||||
- static vsprintf_t real_vsprintf = NULL;
|
||||
- static vsnprintf_t real_vsnprintf = NULL;
|
||||
size_t max_size;
|
||||
int res;
|
||||
|
||||
@@ -1325,7 +1325,6 @@
|
||||
|
||||
int vsnprintf(char *str, size_t size, const char *format, va_list ap)
|
||||
{
|
||||
- static vsnprintf_t real_vsnprintf = NULL;
|
||||
size_t max_size;
|
||||
int res;
|
||||
|
||||
@@ -1361,7 +1360,6 @@
|
||||
|
||||
char *getwd(char *buf)
|
||||
{
|
||||
- static getwd_t real_getwd = NULL;
|
||||
size_t max_size;
|
||||
char *res;
|
||||
|
||||
@@ -1386,7 +1384,6 @@
|
||||
|
||||
char *gets(char *s)
|
||||
{
|
||||
- static gets_t real_gets = NULL;
|
||||
size_t max_size, len;
|
||||
|
||||
if (!real_gets)
|
||||
@@ -1412,7 +1409,6 @@
|
||||
|
||||
char *realpath(char *path, char resolved_path[])
|
||||
{
|
||||
- static realpath_t real_realpath = NULL;
|
||||
size_t max_size, len;
|
||||
char *res;
|
||||
char buf[MAXPATHLEN + 1];
|
||||
@@ -1445,7 +1441,6 @@
|
||||
|
||||
int _IO_vfscanf (_IO_FILE *s, const char *format, _IO_va_list argptr, int *errp)
|
||||
{
|
||||
- static _IO_vfscanf_t real_IO_vfscanf = NULL;
|
||||
int res, save_count;
|
||||
caddr_t ra_array[MAXLEVELS], fp_array[MAXLEVELS];
|
||||
|
||||
@@ -1529,6 +1524,25 @@
|
||||
|
||||
fclose(fp);
|
||||
}
|
||||
+
|
||||
+ real_memcpy = (memcpy_t) getLibraryFunction("memcpy");
|
||||
+ real_IO_vfscanf = (_IO_vfscanf_t) getLibraryFunction("_IO_vfscanf");
|
||||
+ real_vfprintf = (vfprintf_t) getLibraryFunction("vfprintf");
|
||||
+ real_vsnprintf = (vsnprintf_t) getLibraryFunction("vsnprintf");
|
||||
+ real_vsprintf = (vsprintf_t) getLibraryFunction("vsprintf");
|
||||
+ real_gets = (gets_t) getLibraryFunction("gets");
|
||||
+ real_getwd = (getwd_t) getLibraryFunction("getwd");
|
||||
+ real_realpath = (realpath_t) getLibraryFunction("realpath");
|
||||
+ real_stpcpy = (stpcpy_t) getLibraryFunction("stpcpy");
|
||||
+ real_strcat = (strcat_t) getLibraryFunction("strcat");
|
||||
+ real_strcpy = (strcpy_t) getLibraryFunction("strcpy");
|
||||
+ real_strncat = (strncat_t) getLibraryFunction("strncat");
|
||||
+ real_strncpy = (strncpy_t) getLibraryFunction("strncpy");
|
||||
+ real_wcscpy = (wcscpy_t) getLibraryFunction("wcscpy");
|
||||
+ real_wcpcpy = (wcpcpy_t) getLibraryFunction("wcpcpy");
|
||||
+#ifndef MISSING_WCSNLEN
|
||||
+ real_wcscat = (wcscat_t) getLibraryFunction("wcscat");
|
||||
+#endif
|
||||
}
|
||||
|
||||
|
||||
202
src/patches/netpbm-10.26.46-getline.patch
Normal file
202
src/patches/netpbm-10.26.46-getline.patch
Normal file
@@ -0,0 +1,202 @@
|
||||
The getline function used in a couple of places in netpbm-free is also
|
||||
defined by POSIX:2008, and so netpbm-free fails to build with newer
|
||||
versions of (e)glibc. Here's a patch to rename it.
|
||||
|
||||
* Rename getline functions to get_line to avoid conflict with POSIX:2008.
|
||||
|
||||
--- netpbm-free-10.0.orig/ppm/xvminitoppm.c
|
||||
+++ netpbm-free-10.0/ppm/xvminitoppm.c
|
||||
@@ -14,7 +14,7 @@
|
||||
#include "ppm.h"
|
||||
#define BUFSIZE 256
|
||||
|
||||
-static void getline ARGS((FILE *fp, char *buf));
|
||||
+static void get_line ARGS((FILE *fp, char *buf));
|
||||
|
||||
int
|
||||
main(argc, argv)
|
||||
@@ -48,18 +48,18 @@
|
||||
i++;
|
||||
}
|
||||
|
||||
- getline(ifp, buf);
|
||||
+ get_line(ifp, buf);
|
||||
if( strncmp(buf, "P7 332", 6) != 0 )
|
||||
pm_error("bad magic number - not a XV thumbnail picture");
|
||||
|
||||
while(1) {
|
||||
- getline(ifp, buf);
|
||||
+ get_line(ifp, buf);
|
||||
if( strncmp(buf, "#END_OF_COMMENTS", 16)==0 )
|
||||
break;
|
||||
if( strncmp(buf, "#BUILTIN", 8)==0 )
|
||||
pm_error("cannot convert builtin XV thumbnail pictures");
|
||||
}
|
||||
- getline(ifp, buf);
|
||||
+ get_line(ifp, buf);
|
||||
if( sscanf(buf, "%d %d %d", &cols, &rows, &maxval) != 3 )
|
||||
pm_error("error parsing dimension info");
|
||||
if( maxval != 255 )
|
||||
@@ -85,7 +85,7 @@
|
||||
|
||||
|
||||
static void
|
||||
-getline(fp, buf)
|
||||
+get_line(fp, buf)
|
||||
FILE *fp;
|
||||
char *buf;
|
||||
{
|
||||
--- netpbm-free-10.0.orig/ppm/xpmtoppm.c
|
||||
+++ netpbm-free-10.0/ppm/xpmtoppm.c
|
||||
@@ -114,7 +114,7 @@
|
||||
|
||||
|
||||
static void
|
||||
-getline(char * const line, int const size, FILE * const stream) {
|
||||
+get_line(char * const line, int const size, FILE * const stream) {
|
||||
/*----------------------------------------------------------------------------
|
||||
Read the next line from the input file 'stream', through the one-line
|
||||
buffer lastInputLine[].
|
||||
@@ -130,7 +130,7 @@
|
||||
Exit program if the line doesn't fit in the buffer.
|
||||
-----------------------------------------------------------------------------*/
|
||||
if (size > MAX_LINE+1)
|
||||
- pm_error("INTERNAL ERROR: getline() received 'size' parameter "
|
||||
+ pm_error("INTERNAL ERROR: get_line() received 'size' parameter "
|
||||
"which is out of bounds");
|
||||
|
||||
if (backup) {
|
||||
@@ -346,7 +346,7 @@
|
||||
int * const transparentP) {
|
||||
/*----------------------------------------------------------------------------
|
||||
Read the header of the XPM file on stream 'stream'. Assume the
|
||||
- getline() stream is presently positioned to the beginning of the
|
||||
+ get_line() stream is presently positioned to the beginning of the
|
||||
file and it is a Version 3 XPM file. Leave the stream positioned
|
||||
after the header.
|
||||
|
||||
@@ -377,25 +377,25 @@
|
||||
*widthP = *heightP = *ncolorsP = *chars_per_pixelP = -1;
|
||||
|
||||
/* Read the XPM signature comment */
|
||||
- getline(line, sizeof(line), stream);
|
||||
+ get_line(line, sizeof(line), stream);
|
||||
if (strncmp(line, xpm3_signature, strlen(xpm3_signature)) != 0)
|
||||
pm_error("Apparent XPM 3 file does not start with '/* XPM */'. "
|
||||
"First line is '%s'", xpm3_signature);
|
||||
|
||||
/* Read the assignment line */
|
||||
- getline(line, sizeof(line), stream);
|
||||
+ get_line(line, sizeof(line), stream);
|
||||
if (strncmp(line, "static char", 11) != 0)
|
||||
pm_error("Cannot find data structure declaration. Expected a "
|
||||
"line starting with 'static char', but found the line "
|
||||
"'%s'.", line);
|
||||
|
||||
/* Read the hints line */
|
||||
- getline(line, sizeof(line), stream);
|
||||
+ get_line(line, sizeof(line), stream);
|
||||
/* skip the comment line if any */
|
||||
if (!strncmp(line, "/*", 2)) {
|
||||
while (!strstr(line, "*/"))
|
||||
- getline(line, sizeof(line), stream);
|
||||
- getline(line, sizeof(line), stream);
|
||||
+ get_line(line, sizeof(line), stream);
|
||||
+ get_line(line, sizeof(line), stream);
|
||||
}
|
||||
if (sscanf(line, "\"%d %d %d %d\",", widthP, heightP,
|
||||
ncolorsP, chars_per_pixelP) != 4)
|
||||
@@ -427,10 +427,10 @@
|
||||
*transparentP = -1; /* initial value */
|
||||
|
||||
for (seqNum = 0; seqNum < *ncolorsP; seqNum++) {
|
||||
- getline(line, sizeof(line), stream);
|
||||
+ get_line(line, sizeof(line), stream);
|
||||
/* skip the comment line if any */
|
||||
if (!strncmp(line, "/*", 2))
|
||||
- getline(line, sizeof(line), stream);
|
||||
+ get_line(line, sizeof(line), stream);
|
||||
|
||||
interpretXpm3ColorTableLine(line, seqNum, *chars_per_pixelP,
|
||||
*colorsP, *ptabP, transparentP);
|
||||
@@ -445,7 +445,7 @@
|
||||
pixel ** const colorsP, int ** const ptabP) {
|
||||
/*----------------------------------------------------------------------------
|
||||
Read the header of the XPM file on stream 'stream'. Assume the
|
||||
- getline() stream is presently positioned to the beginning of the
|
||||
+ get_line() stream is presently positioned to the beginning of the
|
||||
file and it is a Version 1 XPM file. Leave the stream positioned
|
||||
after the header.
|
||||
|
||||
@@ -464,7 +464,7 @@
|
||||
/* Read the initial defines. */
|
||||
processedStaticChar = FALSE;
|
||||
while (!processedStaticChar) {
|
||||
- getline(line, sizeof(line), stream);
|
||||
+ get_line(line, sizeof(line), stream);
|
||||
|
||||
if (sscanf(line, "#define %s %d", str1, &v) == 2) {
|
||||
char *t1;
|
||||
@@ -512,7 +512,7 @@
|
||||
/* If there's a monochrome color table, skip it. */
|
||||
if (!strncmp(t1, "mono", 4)) {
|
||||
for (;;) {
|
||||
- getline(line, sizeof(line), stream);
|
||||
+ get_line(line, sizeof(line), stream);
|
||||
if (!strncmp(line, "static char", 11))
|
||||
break;
|
||||
}
|
||||
@@ -533,7 +533,7 @@
|
||||
|
||||
/* Read color table. */
|
||||
for (i = 0; i < *ncolorsP; ++i) {
|
||||
- getline(line, sizeof(line), stream);
|
||||
+ get_line(line, sizeof(line), stream);
|
||||
|
||||
if ((t1 = strchr(line, '"')) == NULL)
|
||||
pm_error("D error scanning color table");
|
||||
@@ -569,7 +569,7 @@
|
||||
"static char ...").
|
||||
*/
|
||||
for (;;) {
|
||||
- getline(line, sizeof(line), stream);
|
||||
+ get_line(line, sizeof(line), stream);
|
||||
if (strncmp(line, "static char", 11) == 0)
|
||||
break;
|
||||
}
|
||||
@@ -660,7 +660,7 @@
|
||||
backup = FALSE;
|
||||
|
||||
/* Read the header line */
|
||||
- getline(line, sizeof(line), stream);
|
||||
+ get_line(line, sizeof(line), stream);
|
||||
backup = TRUE; /* back up so next read reads this line again */
|
||||
|
||||
rc = sscanf(line, "/* %s */", str1);
|
||||
@@ -681,7 +681,7 @@
|
||||
pm_error("Could not get %d bytes of memory for image", totalpixels);
|
||||
cursor = *dataP;
|
||||
maxcursor = *dataP + totalpixels - 1;
|
||||
- getline(line, sizeof(line), stream);
|
||||
+ get_line(line, sizeof(line), stream);
|
||||
/* read next line (first line may not always start with comment) */
|
||||
while (cursor <= maxcursor) {
|
||||
if (strncmp(line, "/*", 2) == 0) {
|
||||
@@ -691,7 +691,7 @@
|
||||
ncolors, ptab, &cursor, maxcursor);
|
||||
}
|
||||
if (cursor <= maxcursor)
|
||||
- getline(line, sizeof(line), stream);
|
||||
+ get_line(line, sizeof(line), stream);
|
||||
}
|
||||
if (ptab) free(ptab);
|
||||
}
|
||||
|
||||
Thanks,
|
||||
|
||||
--
|
||||
Colin Watson [cjwatson@ubuntu.com]
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -298,7 +298,7 @@ entershell() {
|
||||
CFLAGS="$CF2LAGS" CXXFLAGS="$CXX2FLAGS" \
|
||||
CCACHE_DIR=/usr/src/ccache \
|
||||
CCACHE_COMPRESS=1 \
|
||||
CCACHE_HASHDIR=1 \
|
||||
CCACHE_COMPILERCHECK="none" \
|
||||
KVER=$KVER \
|
||||
BUILDTARGET="$BUILDTARGET" \
|
||||
MACHINE="$MACHINE" \
|
||||
@@ -415,7 +415,8 @@ lfsmake2() {
|
||||
CONFIG_ROOT=$CONFIG_ROOT \
|
||||
NAME="$NAME" SNAME="$SNAME" SLOGAN="$SLOGAN" \
|
||||
CFLAGS="$C2FLAGS" CXXFLAGS="$CXX2FLAGS" \
|
||||
CCACHE_DIR=/usr/src/ccache CCACHE_COMPRESS=1 CCACHE_HASHDIR=1 \
|
||||
CCACHE_DIR=/usr/src/ccache CCACHE_COMPRESS=1 \
|
||||
CCACHE_COMPILERCHECK="none" \
|
||||
KVER=$KVER MAKETUNING=$MAKETUNING \
|
||||
BUILDTARGET="$BUILDTARGET" MACHINE="$MACHINE" \
|
||||
MACHINE_TYPE="$MACHINE_TYPE" \
|
||||
@@ -448,7 +449,8 @@ ipfiremake() {
|
||||
CONFIG_ROOT=$CONFIG_ROOT \
|
||||
NAME="$NAME" SNAME="$SNAME" SLOGAN="$SLOGAN" \
|
||||
CFLAGS="$C2FLAGS" CXXFLAGS="$CXX2FLAGS" \
|
||||
CCACHE_DIR=/usr/src/ccache CCACHE_COMPRESS=1 CCACHE_HASHDIR=1 \
|
||||
CCACHE_DIR=/usr/src/ccache CCACHE_COMPRESS=1 \
|
||||
CCACHE_COMPILERCHECK="none" \
|
||||
KVER=$KVER MAKETUNING=$MAKETUNING \
|
||||
BUILDTARGET="$BUILDTARGET" MACHINE="$MACHINE" \
|
||||
MACHINE_TYPE="$MACHINE_TYPE" \
|
||||
@@ -480,7 +482,8 @@ ipfiredist() {
|
||||
CONFIG_ROOT=$CONFIG_ROOT \
|
||||
NAME="$NAME" SNAME="$SNAME" SLOGAN="$SLOGAN" \
|
||||
CFLAGS="$C2FLAGS" CXXFLAGS="$CXX2FLAGS" \
|
||||
CCACHE_DIR=/usr/src/ccache CCACHE_COMPRESS=1 CCACHE_HASHDIR=1 \
|
||||
CCACHE_DIR=/usr/src/ccache CCACHE_COMPRESS=1 \
|
||||
CCACHE_COMPILERCHECK="none" \
|
||||
KVER=$KVER \
|
||||
BUILDTARGET="$BUILDTARGET" MACHINE="$MACHINE" \
|
||||
MACHINE_TYPE="$MACHINE_TYPE" \
|
||||
|
||||
Reference in New Issue
Block a user