This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".
The branch, thirteen has been updated via 1313b031a8e057b580525d4429ad485571844086 (commit) via cec995ab18935deccb2d2c84d2be9f29c407763a (commit) via 34b0e6cb1f1c0a4e624f7d1d72e6b0ec88371026 (commit) via 3eb54d929ec220763bd6ec8ace56753198d0d8ab (commit) via edd741eb13c696e028f375dc65cc49a187b4d2e6 (commit) via 8ebe10284f3d074a16524abe8418091d23ae17e8 (commit) from a415ec92ea3745ac5efe32fdbfc5ef11f86408f9 (commit)
Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.
- Log ----------------------------------------------------------------- commit 1313b031a8e057b580525d4429ad485571844086 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Mon Nov 5 15:15:57 2012 +0100
setclock: create /dev/rtc symlink if it not exist.
commit cec995ab18935deccb2d2c84d2be9f29c407763a Author: Arne Fitzenreiter arne_f@ipfire.org Date: Mon Nov 5 15:10:31 2012 +0100
videolan: removed.
this package is outdated and we have not the resources to update and maintain it.
commit 34b0e6cb1f1c0a4e624f7d1d72e6b0ec88371026 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Mon Nov 5 13:03:55 2012 +0100
ipfireseeder: removed.
commit 3eb54d929ec220763bd6ec8ace56753198d0d8ab Author: Arne Fitzenreiter arne_f@ipfire.org Date: Mon Nov 5 10:57:39 2012 +0100
xz: updated to 5.0.4.
commit edd741eb13c696e028f375dc65cc49a187b4d2e6 Merge: 8ebe102 a415ec9 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Mon Nov 5 10:26:35 2012 +0100
Merge branch 'thirteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into thirteen
commit 8ebe10284f3d074a16524abe8418091d23ae17e8 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Mon Nov 5 11:18:03 2012 +0100
installer: updated number of files.
-----------------------------------------------------------------------
Summary of changes: config/rootfiles/common/armv5tel/initscripts | 1 - config/rootfiles/common/i586/initscripts | 1 - config/rootfiles/common/xz | 20 +- config/rootfiles/packages/ipfireseeder | 5 - config/rootfiles/packages/videolan | 415 -------------------------- lfs/ipfireseeder | 84 ------ lfs/videolan | 104 ------- lfs/xz | 6 +- make.sh | 2 - src/initscripts/init.d/ipfireseeder | 64 ---- src/initscripts/init.d/setclock | 7 + src/install+setup/install/main.c | 2 +- src/paks/ipfireseeder/install.sh | 29 -- src/paks/ipfireseeder/uninstall.sh | 42 --- src/paks/ipfireseeder/update.sh | 26 -- 15 files changed, 28 insertions(+), 780 deletions(-) delete mode 100644 config/rootfiles/packages/ipfireseeder delete mode 100644 config/rootfiles/packages/videolan delete mode 100644 lfs/ipfireseeder delete mode 100644 lfs/videolan delete mode 100644 src/initscripts/init.d/ipfireseeder delete mode 100644 src/paks/ipfireseeder/install.sh delete mode 100644 src/paks/ipfireseeder/uninstall.sh delete mode 100644 src/paks/ipfireseeder/update.sh
Difference in files: diff --git a/config/rootfiles/common/armv5tel/initscripts b/config/rootfiles/common/armv5tel/initscripts index ccb7bfb..770c4f7 100644 --- a/config/rootfiles/common/armv5tel/initscripts +++ b/config/rootfiles/common/armv5tel/initscripts @@ -36,7 +36,6 @@ etc/rc.d/init.d/halt #etc/rc.d/init.d/hostapd #etc/rc.d/init.d/icecream #etc/rc.d/init.d/imspector -#etc/rc.d/init.d/ipfireseeder etc/rc.d/init.d/ipsec #etc/rc.d/init.d/lcd4linux #etc/rc.d/init.d/lcr diff --git a/config/rootfiles/common/i586/initscripts b/config/rootfiles/common/i586/initscripts index 653060f..cd61860 100644 --- a/config/rootfiles/common/i586/initscripts +++ b/config/rootfiles/common/i586/initscripts @@ -37,7 +37,6 @@ etc/rc.d/init.d/halt #etc/rc.d/init.d/hostapd #etc/rc.d/init.d/icecream #etc/rc.d/init.d/imspector -#etc/rc.d/init.d/ipfireseeder etc/rc.d/init.d/ipsec #etc/rc.d/init.d/lcd4linux #etc/rc.d/init.d/lcr diff --git a/config/rootfiles/common/xz b/config/rootfiles/common/xz index ef419c5..a8fa20b 100644 --- a/config/rootfiles/common/xz +++ b/config/rootfiles/common/xz @@ -30,18 +30,18 @@ usr/bin/xzmore #usr/include/lzma/container.h #usr/include/lzma/delta.h #usr/include/lzma/filter.h +#usr/include/lzma/hardware.h #usr/include/lzma/index.h #usr/include/lzma/index_hash.h #usr/include/lzma/lzma.h #usr/include/lzma/stream_flags.h -#usr/include/lzma/subblock.h #usr/include/lzma/version.h #usr/include/lzma/vli.h #usr/lib/liblzma.a #usr/lib/liblzma.la usr/lib/liblzma.so -usr/lib/liblzma.so.0 -usr/lib/liblzma.so.0.0.0 +usr/lib/liblzma.so.5 +usr/lib/liblzma.so.5.0.4 #usr/lib/pkgconfig/liblzma.pc #usr/share/doc/xz #usr/share/doc/xz/AUTHORS @@ -51,10 +51,24 @@ usr/lib/liblzma.so.0.0.0 #usr/share/doc/xz/README #usr/share/doc/xz/THANKS #usr/share/doc/xz/TODO +#usr/share/doc/xz/examples +#usr/share/doc/xz/examples/00_README.txt +#usr/share/doc/xz/examples/01_compress_easy.c +#usr/share/doc/xz/examples/02_decompress.c +#usr/share/doc/xz/examples/03_compress_custom.c +#usr/share/doc/xz/examples/Makefile +#usr/share/doc/xz/examples_old +#usr/share/doc/xz/examples_old/xz_pipe_comp.c +#usr/share/doc/xz/examples_old/xz_pipe_decomp.c #usr/share/doc/xz/faq.txt #usr/share/doc/xz/history.txt #usr/share/doc/xz/lzma-file-format.txt #usr/share/doc/xz/xz-file-format.txt +#usr/share/locale/cs/LC_MESSAGES/xz.mo +#usr/share/locale/de/LC_MESSAGES/xz.mo +#usr/share/locale/fr/LC_MESSAGES/xz.mo +#usr/share/locale/it/LC_MESSAGES/xz.mo +#usr/share/locale/pl/LC_MESSAGES/xz.mo #usr/share/man/man1/lzcat.1 #usr/share/man/man1/lzcmp.1 #usr/share/man/man1/lzdiff.1 diff --git a/config/rootfiles/packages/ipfireseeder b/config/rootfiles/packages/ipfireseeder deleted file mode 100644 index 0577ade..0000000 --- a/config/rootfiles/packages/ipfireseeder +++ /dev/null @@ -1,5 +0,0 @@ -etc/rc.d/init.d/ipfireseeder -#var/ipfire/seeder -var/ipfire/seeder/ipfire-2.9.MACHINE-full-core51.iso.torrent -#var/log/seeder -var/log/seeder/info diff --git a/config/rootfiles/packages/videolan b/config/rootfiles/packages/videolan deleted file mode 100644 index 2b980f9..0000000 --- a/config/rootfiles/packages/videolan +++ /dev/null @@ -1,415 +0,0 @@ -usr/bin/vlc -usr/bin/vlc-config -#usr/include/vlc -#usr/include/vlc/aout.h -#usr/include/vlc/decoder.h -#usr/include/vlc/input.h -#usr/include/vlc/intf.h -#usr/include/vlc/libvlc.h -#usr/include/vlc/mediacontrol.h -#usr/include/vlc/mediacontrol_structures.h -#usr/include/vlc/sout.h -#usr/include/vlc/vlc.h -#usr/include/vlc/vout.h -#usr/lib/libvlc.a -#usr/lib/vlc -#usr/lib/vlc/access -usr/lib/vlc/access/libaccess_directory_plugin.so -usr/lib/vlc/access/libaccess_fake_plugin.so -usr/lib/vlc/access/libaccess_file_plugin.so -usr/lib/vlc/access/libaccess_ftp_plugin.so -usr/lib/vlc/access/libaccess_http_plugin.so -usr/lib/vlc/access/libaccess_mms_plugin.so -usr/lib/vlc/access/libaccess_smb_plugin.so -usr/lib/vlc/access/libaccess_tcp_plugin.so -usr/lib/vlc/access/libaccess_udp_plugin.so -usr/lib/vlc/access/libcdda_plugin.so -usr/lib/vlc/access/libdvb_plugin.so -usr/lib/vlc/access/libv4l_plugin.so -usr/lib/vlc/access/libvcd_plugin.so -#usr/lib/vlc/access_filter -usr/lib/vlc/access_filter/libaccess_filter_dump_plugin.so -usr/lib/vlc/access_filter/libaccess_filter_record_plugin.so -usr/lib/vlc/access_filter/libaccess_filter_timeshift_plugin.so -#usr/lib/vlc/access_output -usr/lib/vlc/access_output/libaccess_output_dummy_plugin.so -usr/lib/vlc/access_output/libaccess_output_file_plugin.so -usr/lib/vlc/access_output/libaccess_output_http_plugin.so -usr/lib/vlc/access_output/libaccess_output_shout_plugin.so -usr/lib/vlc/access_output/libaccess_output_udp_plugin.so -#usr/lib/vlc/audio_filter -usr/lib/vlc/audio_filter/liba52tospdif_plugin.so -usr/lib/vlc/audio_filter/libaudio_format_plugin.so -usr/lib/vlc/audio_filter/libbandlimited_resampler_plugin.so -usr/lib/vlc/audio_filter/libdolby_surround_decoder_plugin.so -usr/lib/vlc/audio_filter/libdtstospdif_plugin.so -usr/lib/vlc/audio_filter/libequalizer_plugin.so -usr/lib/vlc/audio_filter/libfixed32tofloat32_plugin.so -usr/lib/vlc/audio_filter/libfixed32tos16_plugin.so -usr/lib/vlc/audio_filter/libfloat32tos16_plugin.so -usr/lib/vlc/audio_filter/libfloat32tos8_plugin.so -usr/lib/vlc/audio_filter/libfloat32tou16_plugin.so -usr/lib/vlc/audio_filter/libfloat32tou8_plugin.so -usr/lib/vlc/audio_filter/libheadphone_channel_mixer_plugin.so -usr/lib/vlc/audio_filter/liblinear_resampler_plugin.so -usr/lib/vlc/audio_filter/libmpgatofixed32_plugin.so -usr/lib/vlc/audio_filter/libnormvol_plugin.so -usr/lib/vlc/audio_filter/libparam_eq_plugin.so -usr/lib/vlc/audio_filter/libs16tofixed32_plugin.so -usr/lib/vlc/audio_filter/libs16tofloat32_plugin.so -usr/lib/vlc/audio_filter/libs16tofloat32swab_plugin.so -usr/lib/vlc/audio_filter/libs8tofloat32_plugin.so -usr/lib/vlc/audio_filter/libsimple_channel_mixer_plugin.so -usr/lib/vlc/audio_filter/libtrivial_channel_mixer_plugin.so -usr/lib/vlc/audio_filter/libtrivial_resampler_plugin.so -usr/lib/vlc/audio_filter/libu8tofixed32_plugin.so -usr/lib/vlc/audio_filter/libu8tofloat32_plugin.so -usr/lib/vlc/audio_filter/libugly_resampler_plugin.so -#usr/lib/vlc/audio_mixer -usr/lib/vlc/audio_mixer/libfloat32_mixer_plugin.so -usr/lib/vlc/audio_mixer/libspdif_mixer_plugin.so -usr/lib/vlc/audio_mixer/libtrivial_mixer_plugin.so -#usr/lib/vlc/audio_output -usr/lib/vlc/audio_output/libalsa_plugin.so -usr/lib/vlc/audio_output/libaout_file_plugin.so -usr/lib/vlc/audio_output/libaout_sdl_plugin.so -usr/lib/vlc/audio_output/liboss_plugin.so -#usr/lib/vlc/codec -usr/lib/vlc/codec/liba52_plugin.so -usr/lib/vlc/codec/libadpcm_plugin.so -usr/lib/vlc/codec/libaraw_plugin.so -usr/lib/vlc/codec/libcinepak_plugin.so -usr/lib/vlc/codec/libcmml_plugin.so -usr/lib/vlc/codec/libcvdsub_plugin.so -usr/lib/vlc/codec/libdts_plugin.so -usr/lib/vlc/codec/libdvbsub_plugin.so -usr/lib/vlc/codec/libfaad_plugin.so -usr/lib/vlc/codec/libfake_plugin.so -usr/lib/vlc/codec/libflacdec_plugin.so -usr/lib/vlc/codec/liblibmpeg2_plugin.so -usr/lib/vlc/codec/liblpcm_plugin.so -usr/lib/vlc/codec/libmpeg_audio_plugin.so -usr/lib/vlc/codec/libpng_plugin.so -usr/lib/vlc/codec/librawvideo_plugin.so -usr/lib/vlc/codec/libspudec_plugin.so -usr/lib/vlc/codec/libsubsdec_plugin.so -usr/lib/vlc/codec/libsvcdsub_plugin.so -usr/lib/vlc/codec/libtelx_plugin.so -usr/lib/vlc/codec/libvorbis_plugin.so -#usr/lib/vlc/control -usr/lib/vlc/control/libgestures_plugin.so -usr/lib/vlc/control/libhotkeys_plugin.so -usr/lib/vlc/control/libhttp_plugin.so -usr/lib/vlc/control/libnetsync_plugin.so -usr/lib/vlc/control/librc_plugin.so -usr/lib/vlc/control/libshowintf_plugin.so -usr/lib/vlc/control/libtelnet_plugin.so -#usr/lib/vlc/demux -usr/lib/vlc/demux/liba52sys_plugin.so -usr/lib/vlc/demux/libaiff_plugin.so -usr/lib/vlc/demux/libasf_plugin.so -usr/lib/vlc/demux/libau_plugin.so -usr/lib/vlc/demux/libavi_plugin.so -usr/lib/vlc/demux/libdemuxdump_plugin.so -usr/lib/vlc/demux/libdtssys_plugin.so -usr/lib/vlc/demux/libflac_plugin.so -usr/lib/vlc/demux/libh264_plugin.so -usr/lib/vlc/demux/libid3tag_plugin.so -usr/lib/vlc/demux/libm3u_plugin.so -usr/lib/vlc/demux/libm4a_plugin.so -usr/lib/vlc/demux/libm4v_plugin.so -usr/lib/vlc/demux/libmjpeg_plugin.so -usr/lib/vlc/demux/libmp4_plugin.so -usr/lib/vlc/demux/libmpga_plugin.so -usr/lib/vlc/demux/libmpgv_plugin.so -usr/lib/vlc/demux/libnsc_plugin.so -usr/lib/vlc/demux/libnsv_plugin.so -usr/lib/vlc/demux/libnuv_plugin.so -usr/lib/vlc/demux/libogg_plugin.so -usr/lib/vlc/demux/libplaylist_plugin.so -usr/lib/vlc/demux/libps_plugin.so -usr/lib/vlc/demux/libpva_plugin.so -usr/lib/vlc/demux/librawdv_plugin.so -usr/lib/vlc/demux/libreal_plugin.so -usr/lib/vlc/demux/libsgimb_plugin.so -usr/lib/vlc/demux/libsubtitle_plugin.so -usr/lib/vlc/demux/libts_plugin.so -usr/lib/vlc/demux/libtta_plugin.so -usr/lib/vlc/demux/libty_plugin.so -usr/lib/vlc/demux/libvobsub_plugin.so -usr/lib/vlc/demux/libvoc_plugin.so -usr/lib/vlc/demux/libwav_plugin.so -usr/lib/vlc/demux/libxa_plugin.so -#usr/lib/vlc/gui -usr/lib/vlc/gui/libncurses_plugin.so -#usr/lib/vlc/libffmpeg.a -#usr/lib/vlc/libi420_rgb_mmx.a -#usr/lib/vlc/libi420_ymga_mmx.a -#usr/lib/vlc/libi420_yuy2_mmx.a -#usr/lib/vlc/libi422_yuy2_mmx.a -#usr/lib/vlc/libmemcpy3dn.a -#usr/lib/vlc/libmemcpymmx.a -#usr/lib/vlc/libmemcpymmxext.a -#usr/lib/vlc/libmux_ts.a -#usr/lib/vlc/libstream_out_switcher.a -#usr/lib/vlc/misc -usr/lib/vlc/misc/libdummy_plugin.so -usr/lib/vlc/misc/libexport_plugin.so -usr/lib/vlc/misc/libfreetype_plugin.so -usr/lib/vlc/misc/libgrowl_plugin.so -usr/lib/vlc/misc/libipv4_plugin.so -usr/lib/vlc/misc/libipv6_plugin.so -usr/lib/vlc/misc/liblogger_plugin.so -usr/lib/vlc/misc/libmemcpy_plugin.so -usr/lib/vlc/misc/libscreensaver_plugin.so -usr/lib/vlc/misc/libvod_rtsp_plugin.so -usr/lib/vlc/misc/libxml_plugin.so -usr/lib/vlc/misc/libxtag_plugin.so -#usr/lib/vlc/mux -usr/lib/vlc/mux/libmux_asf_plugin.so -usr/lib/vlc/mux/libmux_avi_plugin.so -usr/lib/vlc/mux/libmux_dummy_plugin.so -usr/lib/vlc/mux/libmux_mp4_plugin.so -usr/lib/vlc/mux/libmux_mpjpeg_plugin.so -usr/lib/vlc/mux/libmux_ogg_plugin.so -usr/lib/vlc/mux/libmux_ps_plugin.so -usr/lib/vlc/mux/libmux_wav_plugin.so -#usr/lib/vlc/packetizer -usr/lib/vlc/packetizer/libpacketizer_copy_plugin.so -usr/lib/vlc/packetizer/libpacketizer_h264_plugin.so -usr/lib/vlc/packetizer/libpacketizer_mpeg4audio_plugin.so -usr/lib/vlc/packetizer/libpacketizer_mpeg4video_plugin.so -usr/lib/vlc/packetizer/libpacketizer_mpegvideo_plugin.so -#usr/lib/vlc/services_discovery -usr/lib/vlc/services_discovery/libpodcast_plugin.so -usr/lib/vlc/services_discovery/libsap_plugin.so -usr/lib/vlc/services_discovery/libshout_plugin.so -usr/lib/vlc/services_discovery/libupnp_intel_plugin.so -#usr/lib/vlc/stream_out -usr/lib/vlc/stream_out/libstream_out_bridge_plugin.so -usr/lib/vlc/stream_out/libstream_out_description_plugin.so -usr/lib/vlc/stream_out/libstream_out_display_plugin.so -usr/lib/vlc/stream_out/libstream_out_dummy_plugin.so -usr/lib/vlc/stream_out/libstream_out_duplicate_plugin.so -usr/lib/vlc/stream_out/libstream_out_es_plugin.so -usr/lib/vlc/stream_out/libstream_out_gather_plugin.so -usr/lib/vlc/stream_out/libstream_out_mosaic_bridge_plugin.so -usr/lib/vlc/stream_out/libstream_out_rtp_plugin.so -usr/lib/vlc/stream_out/libstream_out_standard_plugin.so -usr/lib/vlc/stream_out/libstream_out_transcode_plugin.so -#usr/lib/vlc/video_chroma -usr/lib/vlc/video_chroma/libi420_rgb_plugin.so -usr/lib/vlc/video_chroma/libi420_ymga_plugin.so -usr/lib/vlc/video_chroma/libi420_yuy2_plugin.so -usr/lib/vlc/video_chroma/libi422_yuy2_plugin.so -#usr/lib/vlc/video_filter -usr/lib/vlc/video_filter/libadjust_plugin.so -usr/lib/vlc/video_filter/libblend_plugin.so -usr/lib/vlc/video_filter/libclone_plugin.so -usr/lib/vlc/video_filter/libcrop_plugin.so -usr/lib/vlc/video_filter/libdeinterlace_plugin.so -usr/lib/vlc/video_filter/libdistort_plugin.so -usr/lib/vlc/video_filter/libinvert_plugin.so -usr/lib/vlc/video_filter/liblogo_plugin.so -usr/lib/vlc/video_filter/libmagnify_plugin.so -usr/lib/vlc/video_filter/libmarq_plugin.so -usr/lib/vlc/video_filter/libmosaic_plugin.so -usr/lib/vlc/video_filter/libmotionblur_plugin.so -usr/lib/vlc/video_filter/libmotiondetect_plugin.so -usr/lib/vlc/video_filter/libosdmenu_plugin.so -usr/lib/vlc/video_filter/librss_plugin.so -usr/lib/vlc/video_filter/librv32_plugin.so -usr/lib/vlc/video_filter/libscale_plugin.so -usr/lib/vlc/video_filter/libtime_plugin.so -usr/lib/vlc/video_filter/libtransform_plugin.so -usr/lib/vlc/video_filter/libwall_plugin.so -#usr/lib/vlc/video_output -usr/lib/vlc/video_output/libdirectfb_plugin.so -usr/lib/vlc/video_output/libfb_plugin.so -usr/lib/vlc/video_output/libimage_plugin.so -usr/lib/vlc/video_output/libvout_sdl_plugin.so -#usr/lib/vlc/visualization -usr/lib/vlc/visualization/libvisual_plugin.so -#usr/share/applications/vlc.desktop -#usr/share/doc/vlc -#usr/share/doc/vlc/bugreport-howto.txt -#usr/share/doc/vlc/fortunes.txt -#usr/share/doc/vlc/intf-cdda.txt -#usr/share/doc/vlc/intf-vcd.txt -#usr/share/vlc -#usr/share/vlc/http -usr/share/vlc/http/.hosts -#usr/share/vlc/http/dialogs -usr/share/vlc/http/dialogs/.hosts -usr/share/vlc/http/dialogs/browse -usr/share/vlc/http/dialogs/footer -usr/share/vlc/http/dialogs/input -usr/share/vlc/http/dialogs/main -usr/share/vlc/http/dialogs/mosaic -usr/share/vlc/http/dialogs/playlist -usr/share/vlc/http/dialogs/sout -usr/share/vlc/http/dialogs/vlm -usr/share/vlc/http/favicon.ico -usr/share/vlc/http/iehacks.css -#usr/share/vlc/http/images -usr/share/vlc/http/images/delete.png -usr/share/vlc/http/images/delete_small.png -usr/share/vlc/http/images/eject.png -usr/share/vlc/http/images/empty.png -usr/share/vlc/http/images/fullscreen.png -usr/share/vlc/http/images/help.png -usr/share/vlc/http/images/info.png -usr/share/vlc/http/images/loop.png -usr/share/vlc/http/images/minus.png -usr/share/vlc/http/images/next.png -usr/share/vlc/http/images/pause.png -usr/share/vlc/http/images/play.png -usr/share/vlc/http/images/playlist.png -usr/share/vlc/http/images/playlist_small.png -usr/share/vlc/http/images/plus.png -usr/share/vlc/http/images/prev.png -usr/share/vlc/http/images/refresh.png -usr/share/vlc/http/images/repeat.png -usr/share/vlc/http/images/sd.png -usr/share/vlc/http/images/shuffle.png -usr/share/vlc/http/images/slider_bar.png -usr/share/vlc/http/images/slider_left.png -usr/share/vlc/http/images/slider_point.png -usr/share/vlc/http/images/slider_right.png -usr/share/vlc/http/images/slow.png -usr/share/vlc/http/images/snapshot.png -usr/share/vlc/http/images/sort.png -usr/share/vlc/http/images/sout.png -usr/share/vlc/http/images/speaker.png -usr/share/vlc/http/images/speaker_mute.png -usr/share/vlc/http/images/stop.png -usr/share/vlc/http/images/vlc16x16.png -usr/share/vlc/http/images/volume_down.png -usr/share/vlc/http/images/volume_up.png -usr/share/vlc/http/images/white.png -usr/share/vlc/http/images/white_cross_small.png -usr/share/vlc/http/index.html -#usr/share/vlc/http/js -usr/share/vlc/http/js/functions.js -usr/share/vlc/http/js/mosaic.js -usr/share/vlc/http/js/vlm.js -usr/share/vlc/http/mosaic.html -#usr/share/vlc/http/old -usr/share/vlc/http/old/.hosts -#usr/share/vlc/http/old/admin -usr/share/vlc/http/old/admin/.access -usr/share/vlc/http/old/admin/browse.html -usr/share/vlc/http/old/admin/dboxfiles.html -usr/share/vlc/http/old/admin/index.html -usr/share/vlc/http/old/cone_minus.png -usr/share/vlc/http/old/cone_plus.png -usr/share/vlc/http/old/index.html -usr/share/vlc/http/old/info.html -usr/share/vlc/http/old/style.css -#usr/share/vlc/http/old/vlm -usr/share/vlc/http/old/vlm/edit.html -usr/share/vlc/http/old/vlm/index.html -usr/share/vlc/http/old/vlm/new.html -usr/share/vlc/http/old/vlm/show.html -usr/share/vlc/http/old/webcam.html -#usr/share/vlc/http/requests -usr/share/vlc/http/requests/browse.xml -usr/share/vlc/http/requests/playlist.xml -usr/share/vlc/http/requests/readme -usr/share/vlc/http/requests/status.xml -usr/share/vlc/http/requests/vlm.xml -usr/share/vlc/http/requests/vlm_cmd.xml -usr/share/vlc/http/style.css -usr/share/vlc/http/vlm.html -usr/share/vlc/http/vlm_export.html -#usr/share/vlc/osdmenu -#usr/share/vlc/osdmenu/default -usr/share/vlc/osdmenu/default.cfg -#usr/share/vlc/osdmenu/default/selected -usr/share/vlc/osdmenu/default/selected/bw.png -usr/share/vlc/osdmenu/default/selected/esc.png -usr/share/vlc/osdmenu/default/selected/fw.png -usr/share/vlc/osdmenu/default/selected/next.png -usr/share/vlc/osdmenu/default/selected/play_pause.png -usr/share/vlc/osdmenu/default/selected/previous.png -usr/share/vlc/osdmenu/default/selected/stop.png -usr/share/vlc/osdmenu/default/selected/volume.png -#usr/share/vlc/osdmenu/default/selection -usr/share/vlc/osdmenu/default/selection/bw.png -usr/share/vlc/osdmenu/default/selection/esc.png -usr/share/vlc/osdmenu/default/selection/fw.png -usr/share/vlc/osdmenu/default/selection/next.png -usr/share/vlc/osdmenu/default/selection/play_pause.png -usr/share/vlc/osdmenu/default/selection/previous.png -usr/share/vlc/osdmenu/default/selection/stop.png -usr/share/vlc/osdmenu/default/selection/volume.png -usr/share/vlc/osdmenu/default/unselected.png -#usr/share/vlc/osdmenu/default/volume -usr/share/vlc/osdmenu/default/volume/volume_00.png -usr/share/vlc/osdmenu/default/volume/volume_01.png -usr/share/vlc/osdmenu/default/volume/volume_02.png -usr/share/vlc/osdmenu/default/volume/volume_03.png -usr/share/vlc/osdmenu/default/volume/volume_04.png -usr/share/vlc/osdmenu/default/volume/volume_05.png -usr/share/vlc/osdmenu/default/volume/volume_06.png -usr/share/vlc/osdmenu/default/volume/volume_07.png -usr/share/vlc/osdmenu/default/volume/volume_08.png -usr/share/vlc/osdmenu/default/volume/volume_09.png -usr/share/vlc/osdmenu/default/volume/volume_10.png -#usr/share/vlc/osdmenu/dvd -usr/share/vlc/osdmenu/dvd.cfg -#usr/share/vlc/osdmenu/dvd/selected -usr/share/vlc/osdmenu/dvd/selected/bw.png -usr/share/vlc/osdmenu/dvd/selected/esc.png -usr/share/vlc/osdmenu/dvd/selected/fw.png -usr/share/vlc/osdmenu/dvd/selected/mute.png -usr/share/vlc/osdmenu/dvd/selected/next.png -usr/share/vlc/osdmenu/dvd/selected/pause.png -usr/share/vlc/osdmenu/dvd/selected/play.png -usr/share/vlc/osdmenu/dvd/selected/previous.png -usr/share/vlc/osdmenu/dvd/selected/slow.png -usr/share/vlc/osdmenu/dvd/selected/stop.png -usr/share/vlc/osdmenu/dvd/selected/volume.png -#usr/share/vlc/osdmenu/dvd/selection -usr/share/vlc/osdmenu/dvd/selection/bw.png -usr/share/vlc/osdmenu/dvd/selection/esc.png -usr/share/vlc/osdmenu/dvd/selection/fw.png -usr/share/vlc/osdmenu/dvd/selection/mute.png -usr/share/vlc/osdmenu/dvd/selection/next.png -usr/share/vlc/osdmenu/dvd/selection/pause.png -usr/share/vlc/osdmenu/dvd/selection/play.png -usr/share/vlc/osdmenu/dvd/selection/previous.png -usr/share/vlc/osdmenu/dvd/selection/slow.png -usr/share/vlc/osdmenu/dvd/selection/stop.png -#usr/share/vlc/osdmenu/dvd/unselect -usr/share/vlc/osdmenu/dvd/unselect/barroff.png -#usr/share/vlc/osdmenu/dvd/volume -usr/share/vlc/osdmenu/dvd/volume/volume00.png -usr/share/vlc/osdmenu/dvd/volume/volume01.png -usr/share/vlc/osdmenu/dvd/volume/volume02.png -usr/share/vlc/osdmenu/dvd/volume/volume03.png -usr/share/vlc/osdmenu/dvd/volume/volume04.png -usr/share/vlc/osdmenu/dvd/volume/volume05.png -usr/share/vlc/pda-forwardb16x16.xpm -usr/share/vlc/pda-openb16x16.xpm -usr/share/vlc/pda-pauseb16x16.xpm -usr/share/vlc/pda-playb16x16.xpm -usr/share/vlc/pda-playlistb16x16.xpm -usr/share/vlc/pda-preferencesb16x16.xpm -usr/share/vlc/pda-rewindb16x16.xpm -usr/share/vlc/pda-stopb16x16.xpm -#usr/share/vlc/skins2 -usr/share/vlc/skins2/default.vlt -#usr/share/vlc/skins2/fonts -usr/share/vlc/skins2/fonts/FreeSans.ttf -usr/share/vlc/skins2/fonts/FreeSansBold.ttf -usr/share/vlc/skins2/skin.catalog -usr/share/vlc/skins2/skin.dtd -usr/share/vlc/skins2/winamp2.xml -usr/share/vlc/vlc128x128.png -usr/share/vlc/vlc16x16.png -usr/share/vlc/vlc16x16.xpm -usr/share/vlc/vlc32x32.png -usr/share/vlc/vlc32x32.xpm -usr/share/vlc/vlc48x48.ico -usr/share/vlc/vlc48x48.png diff --git a/lfs/ipfireseeder b/lfs/ipfireseeder deleted file mode 100644 index 8834bbc..0000000 --- a/lfs/ipfireseeder +++ /dev/null @@ -1,84 +0,0 @@ -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2011 IPFire Team info@ipfire.org # -# # -# 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 = 1.00 - -THISAPP = ipfireseeder-$(VER) -DL_FILE = ipfire-2.9.i586-full-core51.iso.torrent - -DL_FROM = $(URL_IPFIRE) -DIR_APP = $(DIR_SRC)/$(THISAPP) -TARGET = $(DIR_INFO)/$(THISAPP) -SUP_ARCH = i586 -PROG = ipfireseeder -PAK_VER = 27 - -DEPS = "rtorrent" - -############################################################################### -# Top-level Rules -############################################################################### - -objects = $(DL_FILE) - -$(DL_FILE) = $(DL_FROM)/$(DL_FILE) - -$(DL_FILE)_MD5 = fa40cd03e4b0a11f8f703595a5c01a76 - -install : $(TARGET) - -check : $(patsubst %,$(DIR_CHK)/%,$(objects)) - -download :$(patsubst %,$(DIR_DL)/%,$(objects)) - -md5 : $(subst %,%_MD5,$(objects)) - -dist: - @$(PAK) - -############################################################################### -# 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) - -mkdir -p /var/log/seeder /var/ipfire/seeder - cp -vf $(DIR_DL)/$(DL_FILE) /var/ipfire/seeder - echo "Folder for IPFireseeder data" > /var/log/seeder/info - @$(POSTBUILD) diff --git a/lfs/videolan b/lfs/videolan deleted file mode 100644 index 17a9f7a..0000000 --- a/lfs/videolan +++ /dev/null @@ -1,104 +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.8.6i -THISAPP = vlc-$(VER) -DL_FILE = $(THISAPP).tar.bz2 -DL_FILE1 = $(THISAPP)-bugfix-080903.patch.bz2 - -DL_FROM = $(URL_IPFIRE) -DIR_APP = $(DIR_SRC)/$(THISAPP) -TARGET = $(DIR_INFO)/$(THISAPP) -PROG = videolan -PAK_VER = 5 - -DEPS = "libshout libmpeg2 libmad libdvbpsi directfb ffmpeg faad2" - -############################################################################### -# Top-level Rules -############################################################################### - -objects = $(DL_FILE) $(DL_FILE1) - -$(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE1) = $(DL_FROM)/$(DL_FILE1) - -$(DL_FILE)_MD5 = 3c90520c9f22a68d287458d5a8af989e -$(DL_FILE1)_MD5 = 36ea293b5ebb604778b321b5e3e3cdc4 - -install : $(TARGET) - -check : $(patsubst %,$(DIR_CHK)/%,$(objects)) - -download :$(patsubst %,$(DIR_DL)/%,$(objects)) - -md5 : $(subst %,%_MD5,$(objects)) - -dist: - @$(PAK) - -############################################################################### -# 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) - #Apply some patched from videolan 8.6-bugfix branch, - #ignore the error because one patch is already applied - -cd $(DIR_APP) && bzip2 -d -c $(DIR_DL)/$(DL_FILE1) | patch -p1 - cd $(DIR_APP) && ./configure --prefix=/usr --enable-shared --with-ffmpeg-tree=/usr/src/ffmpeg \ - --with-ffmpeg-config=/usr/src/ffmpeg \ - --disable-wxwidgets --disable-skins2 \ - --enable-httpd --enable-pth --enable-shout \ - --enable-smb --enable-cddax --enable-ncurses \ - --enable-a52 --enable-dts --enable-alsa \ - --enable-unicode-utf8 --enable-v4l --enable-vcd \ - --enable-ogg --enable-vorbis --enable-theora \ - --enable-mad --enable-v4l --enable-dvb \ - --with-dvb=/usr/src/v4l-dvb \ - --with-v4l=/usr/src/v4l-dvb \ - --enable-libdvbpsi --enable-faac --enable-mkv \ - --enable-x264 --enable-release --enable-sout \ - --disable-nls --enable-faad \ - --enable-directfb --with-directfb=/usr/src/directfb - cd $(DIR_APP) && make $(MAKETUNING) - cd $(DIR_APP) && make install - @rm -rf $(DIR_APP) - @$(POSTBUILD) diff --git a/lfs/xz b/lfs/xz index cff9bb3..7a56c72 100644 --- a/lfs/xz +++ b/lfs/xz @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2012 IPFire Team info@ipfire.org # # # # 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 # @@ -24,7 +24,7 @@
include Config
-VER = 4.999.9beta +VER = 5.0.4
THISAPP = xz-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -47,7 +47,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = cc4044fcc073b8bcf3164d1d0df82161 +$(DL_FILE)_MD5 = 741cd3a5f64b23b7bac56ec5b2258715
install : $(TARGET)
diff --git a/make.sh b/make.sh index 55684d5..278c807 100755 --- a/make.sh +++ b/make.sh @@ -624,7 +624,6 @@ buildipfire() { ipfiremake libsigc++ ipfiremake libtorrent ipfiremake rtorrent - ipfiremake ipfireseeder ipfiremake rsync ipfiremake tcpwrapper ipfiremake libevent @@ -662,7 +661,6 @@ buildipfire() { ipfiremake dfb++ ipfiremake faad2 ipfiremake ffmpeg - ipfiremake videolan ipfiremake vdr ipfiremake w_scan ipfiremake icecast diff --git a/src/initscripts/init.d/ipfireseeder b/src/initscripts/init.d/ipfireseeder deleted file mode 100644 index 5ce5cdf..0000000 --- a/src/initscripts/init.d/ipfireseeder +++ /dev/null @@ -1,64 +0,0 @@ -#!/bin/sh -######################################################################## -# Begin $rc_base/init.d/ipfireseeder -# -# Description : This is a script that starts the torrent-seeder on your -# local IPFire. -# -# Authors : Michael Tremer (mitch@ipfire.org) -# -# Version : 01.00 -# -# Notes : -# -######################################################################## - -. /etc/sysconfig/rc -. ${rc_functions} - -case "${1}" in - start) - boot_mesg "Starting IPFire Seeder..." - cd /var/log/seeder - # loadproc - screen -dmS seeder /usr/bin/rtorrent -o port_range=35700-35700 \ - -o download_rate=180 -o upload_rate=15 \ - -o min_peers=10 -o max_peers=30 \ - -o min_peers_seed=1 -o max_peers_seed=5 \ - -o max_uploads=3 \ - /var/ipfire/seeder/*.torrent & - evaluate_retval - if ! grep -q "35700:35700" /var/ipfire/xtaccess/config ; then - echo "tcp,0.0.0.0/0,35700:35700,on,0.0.0.0,IPFireSeeder" >> /var/ipfire/xtaccess/config - echo "udp,0.0.0.0/0,35700:35700,on,0.0.0.0,IPFireSeeder" >> /var/ipfire/xtaccess/config - /usr/local/bin/setxtaccess - fi - ;; - - stop) - boot_mesg "Stopping IPFire Seeder..." - killproc /usr/bin/rtorrent - ;; - - reload) - boot_mesg "Reloading IPFire Seeder..." - reloadproc /usr/bin/rtorrent - ;; - - restart) - ${0} stop - sleep 1 - ${0} start - ;; - - status) - statusproc /usr/bin/rtorrent - ;; - - *) - echo "Usage: ${0} {start|stop|reload|restart|status}" - exit 1 - ;; -esac - -# End $rc_base/init.d/ipfireseeder diff --git a/src/initscripts/init.d/setclock b/src/initscripts/init.d/setclock index 908d490..50e4503 100644 --- a/src/initscripts/init.d/setclock +++ b/src/initscripts/init.d/setclock @@ -19,7 +19,14 @@ CLOCKPARAMS=
case ${1} in start) + boot_mesg "Setting system clock..." + + # udev not create the rtc symlink if rtc is in the kernel + if [ ! -e /dev/rtc ]; then + ln -s rtc0 /dev/rtc + fi + hwclock --hctosys ${CLOCKPARAMS} &>/dev/null evaluate_retval ;; diff --git a/src/install+setup/install/main.c b/src/install+setup/install/main.c index 6a50044..b1d512a 100644 --- a/src/install+setup/install/main.c +++ b/src/install+setup/install/main.c @@ -12,7 +12,7 @@ #include "install.h" #define _GNU_SOURCE
-#define INST_FILECOUNT 10700 +#define INST_FILECOUNT 14400 #define UNATTENDED_CONF "/cdrom/boot/unattended.conf" #define LICENSE_FILE "/cdrom/COPYING"
diff --git a/src/paks/ipfireseeder/install.sh b/src/paks/ipfireseeder/install.sh deleted file mode 100644 index 81abf5a..0000000 --- a/src/paks/ipfireseeder/install.sh +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/bash -############################################################################ -# # -# This file is part of the IPFire Firewall. # -# # -# IPFire 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 2 of the License, or # -# (at your option) any later version. # -# # -# IPFire 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 IPFire; if not, write to the Free Software # -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# # -# Copyright (C) 2007 IPFire-Team info@ipfire.org. # -# # -############################################################################ -# -. /opt/pakfire/lib/functions.sh -extract_files -ln -s ../../ipfireseeder /etc/rc.d/init.d/networking/red.up/90-S-ipfireseeder -ln -s ../../ipfireseeder /etc/rc.d/init.d/networking/red.down/01-K-ipfireseeder - -start_service --delay 90 --background ${NAME} diff --git a/src/paks/ipfireseeder/uninstall.sh b/src/paks/ipfireseeder/uninstall.sh deleted file mode 100644 index 888c701..0000000 --- a/src/paks/ipfireseeder/uninstall.sh +++ /dev/null @@ -1,42 +0,0 @@ -#!/bin/bash -############################################################################ -# # -# This file is part of the IPFire Firewall. # -# # -# IPFire 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 2 of the License, or # -# (at your option) any later version. # -# # -# IPFire 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 IPFire; if not, write to the Free Software # -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# # -# Copyright (C) 2007 IPFire-Team info@ipfire.org. # -# # -############################################################################ -# -. /opt/pakfire/lib/functions.sh -stop_service ${NAME} - -#prevent erasing the downloaded data at uninstall/update -cat /opt/pakfire/db/rootfiles/ipfireseeder | \ - grep -v "var/ipfire/seeder" | \ - grep -v "var/log/seeder" > /opt/pakfire/db/rootfiles/ipfireseeder.tmp -mv /opt/pakfire/db/rootfiles/ipfireseeder.tmp \ - /opt/pakfire/db/rootfiles/ipfireseeder - -grep -v "IPFireSeeder" /var/ipfire/xtaccess/config > /var/ipfire/xtaccess/config.tmp -mv /var/ipfire/xtaccess/config.tmp /var/ipfire/xtaccess/config -chown nobody:nobody /var/ipfire/xtaccess/config -chmod 644 /var/ipfire/xtaccess/config - -rm -f /etc/rc.d/rc?.d/???ipfireseeder -rm -f /etc/rc.d/init.d/networking/red.*/??-?-ipfireseeder - -remove_files diff --git a/src/paks/ipfireseeder/update.sh b/src/paks/ipfireseeder/update.sh deleted file mode 100644 index 89c40d0..0000000 --- a/src/paks/ipfireseeder/update.sh +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/bash -############################################################################ -# # -# This file is part of the IPFire Firewall. # -# # -# IPFire 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 2 of the License, or # -# (at your option) any later version. # -# # -# IPFire 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 IPFire; if not, write to the Free Software # -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# # -# Copyright (C) 2007 IPFire-Team info@ipfire.org. # -# # -############################################################################ -# -. /opt/pakfire/lib/functions.sh -./uninstall.sh -./install.sh
hooks/post-receive -- IPFire 2.x development tree